Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1463380

[PATCH 3/7] dax: rename fops from dax_dev_ to dax_

Show all headers | View raw

Shorten the prefix of the file operations to distinguish them from
operations on the struct device associated with the dax_dev.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 drivers/dax/dax.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c
index 3774fc9709bb..994dfa507dfb 100644
--- a/drivers/dax/dax.c
+++ b/drivers/dax/dax.c
@@ -347,7 +347,7 @@ static const struct vm_operations_struct dax_dev_vm_ops = {
 	.close = dax_dev_vm_close,
 };
 
-static int dax_dev_mmap(struct file *filp, struct vm_area_struct *vma)
+static int dax_mmap(struct file *filp, struct vm_area_struct *vma)
 {
 	struct dax_dev *dax_dev = filp->private_data;
 	int rc;
@@ -365,7 +365,7 @@ static int dax_dev_mmap(struct file *filp, struct vm_area_struct *vma)
 }
 
 /* return an unmapped area aligned to the dax region specified alignment */
-static unsigned long dax_dev_get_unmapped_area(struct file *filp,
+static unsigned long dax_get_unmapped_area(struct file *filp,
 		unsigned long addr, unsigned long len, unsigned long pgoff,
 		unsigned long flags)
 {
@@ -411,7 +411,7 @@ static struct device *dax_dev_find(dev_t dev_t)
 	return class_find_device(dax_class, NULL, &dev_t, __match_devt);
 }
 
-static int dax_dev_open(struct inode *inode, struct file *filp)
+static int dax_open(struct inode *inode, struct file *filp)
 {
 	struct dax_dev *dax_dev = NULL;
 	struct device *dev;
@@ -437,7 +437,7 @@ static int dax_dev_open(struct inode *inode, struct file *filp)
 	return 0;
 }
 
-static int dax_dev_release(struct inode *inode, struct file *filp)
+static int dax_release(struct inode *inode, struct file *filp)
 {
 	struct dax_dev *dax_dev = filp->private_data;
 	struct device *dev = dax_dev->dev;
@@ -452,10 +452,10 @@ static int dax_dev_release(struct inode *inode, struct file *filp)
 static const struct file_operations dax_fops = {
 	.llseek = noop_llseek,
 	.owner = THIS_MODULE,
-	.open = dax_dev_open,
-	.release = dax_dev_release,
-	.get_unmapped_area = dax_dev_get_unmapped_area,
-	.mmap = dax_dev_mmap,
+	.open = dax_open,
+	.release = dax_release,
+	.get_unmapped_area = dax_get_unmapped_area,
+	.mmap = dax_mmap,
 };
 
 static void unregister_dax_dev(void *_dev)

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] dax: unified host inode for device-dax mappings Dan Williams <dan.j.williams@intel.com> - 2016-08-16 05:30 +0200
  [PATCH 7/7] dax: unmap/truncate on device shutdown Dan Williams <dan.j.williams@intel.com> - 2016-08-16 05:30 +0200
  [PATCH 4/7] dax: embed a struct device in dax_dev Dan Williams <dan.j.williams@intel.com> - 2016-08-16 05:30 +0200
  [PATCH 5/7] dax: convert to the cdev api Dan Williams <dan.j.williams@intel.com> - 2016-08-16 05:30 +0200
  [PATCH 1/7] dax: cleanup needlessly global symbol warnings Dan Williams <dan.j.williams@intel.com> - 2016-08-16 05:30 +0200
  [PATCH 3/7] dax: rename fops from dax_dev_ to dax_ Dan Williams <dan.j.williams@intel.com> - 2016-08-16 05:30 +0200
  [PATCH 2/7] dax: reorder dax_fops function definitions Dan Williams <dan.j.williams@intel.com> - 2016-08-16 05:30 +0200
  [PATCH 6/7] dax: define a unified inode/address_space for  device-dax mappings Dan Williams <dan.j.williams@intel.com> - 2016-08-16 05:30 +0200

csiph-web