diff options
author | Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> | 2006-12-08 05:36:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:41 -0500 |
commit | f427f5d5d6b0eb729505a2d9c0a6cad22734a74c (patch) | |
tree | d9e15c44036407c74e7ff31f083f3aef6902c0dd /fs/sysfs/file.c | |
parent | 0f7fc9e4d03987fe29f6dd4aa67e4c56eb7ecb05 (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/file.c')
-rw-r--r-- | fs/sysfs/file.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 95c165101c98..9cfe53e1e00d 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
@@ -154,7 +154,7 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos) | |||
154 | 154 | ||
155 | down(&buffer->sem); | 155 | down(&buffer->sem); |
156 | if (buffer->needs_read_fill) { | 156 | if (buffer->needs_read_fill) { |
157 | if ((retval = fill_read_buffer(file->f_dentry,buffer))) | 157 | if ((retval = fill_read_buffer(file->f_path.dentry,buffer))) |
158 | goto out; | 158 | goto out; |
159 | } | 159 | } |
160 | pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n", | 160 | pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n", |
@@ -245,7 +245,7 @@ sysfs_write_file(struct file *file, const char __user *buf, size_t count, loff_t | |||
245 | down(&buffer->sem); | 245 | down(&buffer->sem); |
246 | len = fill_write_buffer(buffer, buf, count); | 246 | len = fill_write_buffer(buffer, buf, count); |
247 | if (len > 0) | 247 | if (len > 0) |
248 | len = flush_write_buffer(file->f_dentry, buffer, len); | 248 | len = flush_write_buffer(file->f_path.dentry, buffer, len); |
249 | if (len > 0) | 249 | if (len > 0) |
250 | *ppos += len; | 250 | *ppos += len; |
251 | up(&buffer->sem); | 251 | up(&buffer->sem); |
@@ -254,8 +254,8 @@ sysfs_write_file(struct file *file, const char __user *buf, size_t count, loff_t | |||
254 | 254 | ||
255 | static int check_perm(struct inode * inode, struct file * file) | 255 | static int check_perm(struct inode * inode, struct file * file) |
256 | { | 256 | { |
257 | struct kobject *kobj = sysfs_get_kobject(file->f_dentry->d_parent); | 257 | struct kobject *kobj = sysfs_get_kobject(file->f_path.dentry->d_parent); |
258 | struct attribute * attr = to_attr(file->f_dentry); | 258 | struct attribute * attr = to_attr(file->f_path.dentry); |
259 | struct sysfs_buffer * buffer; | 259 | struct sysfs_buffer * buffer; |
260 | struct sysfs_ops * ops = NULL; | 260 | struct sysfs_ops * ops = NULL; |
261 | int error = 0; | 261 | int error = 0; |
@@ -337,8 +337,8 @@ static int sysfs_open_file(struct inode * inode, struct file * filp) | |||
337 | 337 | ||
338 | static int sysfs_release(struct inode * inode, struct file * filp) | 338 | static int sysfs_release(struct inode * inode, struct file * filp) |
339 | { | 339 | { |
340 | struct kobject * kobj = to_kobj(filp->f_dentry->d_parent); | 340 | struct kobject * kobj = to_kobj(filp->f_path.dentry->d_parent); |
341 | struct attribute * attr = to_attr(filp->f_dentry); | 341 | struct attribute * attr = to_attr(filp->f_path.dentry); |
342 | struct module * owner = attr->owner; | 342 | struct module * owner = attr->owner; |
343 | struct sysfs_buffer * buffer = filp->private_data; | 343 | struct sysfs_buffer * buffer = filp->private_data; |
344 | 344 | ||
@@ -372,8 +372,8 @@ static int sysfs_release(struct inode * inode, struct file * filp) | |||
372 | static unsigned int sysfs_poll(struct file *filp, poll_table *wait) | 372 | static unsigned int sysfs_poll(struct file *filp, poll_table *wait) |
373 | { | 373 | { |
374 | struct sysfs_buffer * buffer = filp->private_data; | 374 | struct sysfs_buffer * buffer = filp->private_data; |
375 | struct kobject * kobj = to_kobj(filp->f_dentry->d_parent); | 375 | struct kobject * kobj = to_kobj(filp->f_path.dentry->d_parent); |
376 | struct sysfs_dirent * sd = filp->f_dentry->d_fsdata; | 376 | struct sysfs_dirent * sd = filp->f_path.dentry->d_fsdata; |
377 | int res = 0; | 377 | int res = 0; |
378 | 378 | ||
379 | poll_wait(filp, &kobj->poll, wait); | 379 | poll_wait(filp, &kobj->poll, wait); |