Commit 867fa491a2722cee6964a30dfda86e0e02dcb400
Committed by
Linus Torvalds
Linus Torvalds
1 parent
a4669ed8ed
Exists in
master
and in
20 other branches
[PATCH] configfs: 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
configfs filesystem.
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>
Showing 2 changed files with 11 additions and 11 deletions Side-by-side Diff
fs/configfs/dir.c
| ... | ... | @@ -980,7 +980,7 @@ |
| 980 | 980 | |
| 981 | 981 | static int configfs_dir_open(struct inode *inode, struct file *file) |
| 982 | 982 | { |
| 983 | - struct dentry * dentry = file->f_dentry; | |
| 983 | + struct dentry * dentry = file->f_path.dentry; | |
| 984 | 984 | struct configfs_dirent * parent_sd = dentry->d_fsdata; |
| 985 | 985 | |
| 986 | 986 | mutex_lock(&dentry->d_inode->i_mutex); |
| ... | ... | @@ -993,7 +993,7 @@ |
| 993 | 993 | |
| 994 | 994 | static int configfs_dir_close(struct inode *inode, struct file *file) |
| 995 | 995 | { |
| 996 | - struct dentry * dentry = file->f_dentry; | |
| 996 | + struct dentry * dentry = file->f_path.dentry; | |
| 997 | 997 | struct configfs_dirent * cursor = file->private_data; |
| 998 | 998 | |
| 999 | 999 | mutex_lock(&dentry->d_inode->i_mutex); |
| ... | ... | @@ -1013,7 +1013,7 @@ |
| 1013 | 1013 | |
| 1014 | 1014 | static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir) |
| 1015 | 1015 | { |
| 1016 | - struct dentry *dentry = filp->f_dentry; | |
| 1016 | + struct dentry *dentry = filp->f_path.dentry; | |
| 1017 | 1017 | struct configfs_dirent * parent_sd = dentry->d_fsdata; |
| 1018 | 1018 | struct configfs_dirent *cursor = filp->private_data; |
| 1019 | 1019 | struct list_head *p, *q = &cursor->s_sibling; |
| ... | ... | @@ -1070,7 +1070,7 @@ |
| 1070 | 1070 | |
| 1071 | 1071 | static loff_t configfs_dir_lseek(struct file * file, loff_t offset, int origin) |
| 1072 | 1072 | { |
| 1073 | - struct dentry * dentry = file->f_dentry; | |
| 1073 | + struct dentry * dentry = file->f_path.dentry; | |
| 1074 | 1074 | |
| 1075 | 1075 | mutex_lock(&dentry->d_inode->i_mutex); |
| 1076 | 1076 | switch (origin) { |
| ... | ... | @@ -1080,7 +1080,7 @@ |
| 1080 | 1080 | if (offset >= 0) |
| 1081 | 1081 | break; |
| 1082 | 1082 | default: |
| 1083 | - mutex_unlock(&file->f_dentry->d_inode->i_mutex); | |
| 1083 | + mutex_unlock(&file->f_path.dentry->d_inode->i_mutex); | |
| 1084 | 1084 | return -EINVAL; |
| 1085 | 1085 | } |
| 1086 | 1086 | if (offset != file->f_pos) { |
fs/configfs/file.c
| ... | ... | @@ -134,7 +134,7 @@ |
| 134 | 134 | |
| 135 | 135 | down(&buffer->sem); |
| 136 | 136 | if (buffer->needs_read_fill) { |
| 137 | - if ((retval = fill_read_buffer(file->f_dentry,buffer))) | |
| 137 | + if ((retval = fill_read_buffer(file->f_path.dentry,buffer))) | |
| 138 | 138 | goto out; |
| 139 | 139 | } |
| 140 | 140 | pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n", |
| ... | ... | @@ -222,7 +222,7 @@ |
| 222 | 222 | down(&buffer->sem); |
| 223 | 223 | len = fill_write_buffer(buffer, buf, count); |
| 224 | 224 | if (len > 0) |
| 225 | - len = flush_write_buffer(file->f_dentry, buffer, count); | |
| 225 | + len = flush_write_buffer(file->f_path.dentry, buffer, count); | |
| 226 | 226 | if (len > 0) |
| 227 | 227 | *ppos += len; |
| 228 | 228 | up(&buffer->sem); |
| ... | ... | @@ -231,8 +231,8 @@ |
| 231 | 231 | |
| 232 | 232 | static int check_perm(struct inode * inode, struct file * file) |
| 233 | 233 | { |
| 234 | - struct config_item *item = configfs_get_config_item(file->f_dentry->d_parent); | |
| 235 | - struct configfs_attribute * attr = to_attr(file->f_dentry); | |
| 234 | + struct config_item *item = configfs_get_config_item(file->f_path.dentry->d_parent); | |
| 235 | + struct configfs_attribute * attr = to_attr(file->f_path.dentry); | |
| 236 | 236 | struct configfs_buffer * buffer; |
| 237 | 237 | struct configfs_item_operations * ops = NULL; |
| 238 | 238 | int error = 0; |
| ... | ... | @@ -305,8 +305,8 @@ |
| 305 | 305 | |
| 306 | 306 | static int configfs_release(struct inode * inode, struct file * filp) |
| 307 | 307 | { |
| 308 | - struct config_item * item = to_item(filp->f_dentry->d_parent); | |
| 309 | - struct configfs_attribute * attr = to_attr(filp->f_dentry); | |
| 308 | + struct config_item * item = to_item(filp->f_path.dentry->d_parent); | |
| 309 | + struct configfs_attribute * attr = to_attr(filp->f_path.dentry); | |
| 310 | 310 | struct module * owner = attr->ca_owner; |
| 311 | 311 | struct configfs_buffer * buffer = filp->private_data; |
| 312 | 312 |