aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs/bin.c
diff options
context:
space:
mode:
authorJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>2006-12-08 05:36:36 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:41 -0500
commitf427f5d5d6b0eb729505a2d9c0a6cad22734a74c (patch)
treed9e15c44036407c74e7ff31f083f3aef6902c0dd /fs/sysfs/bin.c
parent0f7fc9e4d03987fe29f6dd4aa67e4c56eb7ecb05 (diff)
[PATCH] sysfs: change uses of f_{dentry, vfsmnt} to use f_path
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the sysfs filesystem code. Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/sysfs/bin.c')
-rw-r--r--fs/sysfs/bin.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
index 98022e41cda1..e8f540d38d48 100644
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@ -35,7 +35,7 @@ static ssize_t
35read(struct file * file, char __user * userbuf, size_t count, loff_t * off) 35read(struct file * file, char __user * userbuf, size_t count, loff_t * off)
36{ 36{
37 char *buffer = file->private_data; 37 char *buffer = file->private_data;
38 struct dentry *dentry = file->f_dentry; 38 struct dentry *dentry = file->f_path.dentry;
39 int size = dentry->d_inode->i_size; 39 int size = dentry->d_inode->i_size;
40 loff_t offs = *off; 40 loff_t offs = *off;
41 int ret; 41 int ret;
@@ -81,7 +81,7 @@ static ssize_t write(struct file * file, const char __user * userbuf,
81 size_t count, loff_t * off) 81 size_t count, loff_t * off)
82{ 82{
83 char *buffer = file->private_data; 83 char *buffer = file->private_data;
84 struct dentry *dentry = file->f_dentry; 84 struct dentry *dentry = file->f_path.dentry;
85 int size = dentry->d_inode->i_size; 85 int size = dentry->d_inode->i_size;
86 loff_t offs = *off; 86 loff_t offs = *off;
87 87
@@ -105,7 +105,7 @@ static ssize_t write(struct file * file, const char __user * userbuf,
105 105
106static int mmap(struct file *file, struct vm_area_struct *vma) 106static int mmap(struct file *file, struct vm_area_struct *vma)
107{ 107{
108 struct dentry *dentry = file->f_dentry; 108 struct dentry *dentry = file->f_path.dentry;
109 struct bin_attribute *attr = to_bin_attr(dentry); 109 struct bin_attribute *attr = to_bin_attr(dentry);
110 struct kobject *kobj = to_kobj(dentry->d_parent); 110 struct kobject *kobj = to_kobj(dentry->d_parent);
111 111
@@ -117,8 +117,8 @@ static int mmap(struct file *file, struct vm_area_struct *vma)
117 117
118static int open(struct inode * inode, struct file * file) 118static int open(struct inode * inode, struct file * file)
119{ 119{
120 struct kobject *kobj = sysfs_get_kobject(file->f_dentry->d_parent); 120 struct kobject *kobj = sysfs_get_kobject(file->f_path.dentry->d_parent);
121 struct bin_attribute * attr = to_bin_attr(file->f_dentry); 121 struct bin_attribute * attr = to_bin_attr(file->f_path.dentry);
122 int error = -EINVAL; 122 int error = -EINVAL;
123 123
124 if (!kobj || !attr) 124 if (!kobj || !attr)
@@ -153,8 +153,8 @@ static int open(struct inode * inode, struct file * file)
153 153
154static int release(struct inode * inode, struct file * file) 154static int release(struct inode * inode, struct file * file)
155{ 155{
156 struct kobject * kobj = to_kobj(file->f_dentry->d_parent); 156 struct kobject * kobj = to_kobj(file->f_path.dentry->d_parent);
157 struct bin_attribute * attr = to_bin_attr(file->f_dentry); 157 struct bin_attribute * attr = to_bin_attr(file->f_path.dentry);
158 u8 * buffer = file->private_data; 158 u8 * buffer = file->private_data;
159 159
160 if (kobj) 160 if (kobj)