diff options
Diffstat (limited to 'fs/file_table.c')
-rw-r--r-- | fs/file_table.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index 24f25a057d9c..4c17a18d8c10 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
@@ -152,8 +152,8 @@ EXPORT_SYMBOL(fput); | |||
152 | */ | 152 | */ |
153 | void fastcall __fput(struct file *file) | 153 | void fastcall __fput(struct file *file) |
154 | { | 154 | { |
155 | struct dentry *dentry = file->f_dentry; | 155 | struct dentry *dentry = file->f_path.dentry; |
156 | struct vfsmount *mnt = file->f_vfsmnt; | 156 | struct vfsmount *mnt = file->f_path.mnt; |
157 | struct inode *inode = dentry->d_inode; | 157 | struct inode *inode = dentry->d_inode; |
158 | 158 | ||
159 | might_sleep(); | 159 | might_sleep(); |
@@ -176,8 +176,8 @@ void fastcall __fput(struct file *file) | |||
176 | put_write_access(inode); | 176 | put_write_access(inode); |
177 | put_pid(file->f_owner.pid); | 177 | put_pid(file->f_owner.pid); |
178 | file_kill(file); | 178 | file_kill(file); |
179 | file->f_dentry = NULL; | 179 | file->f_path.dentry = NULL; |
180 | file->f_vfsmnt = NULL; | 180 | file->f_path.mnt = NULL; |
181 | file_free(file); | 181 | file_free(file); |
182 | dput(dentry); | 182 | dput(dentry); |
183 | mntput(mnt); | 183 | mntput(mnt); |
@@ -271,7 +271,7 @@ int fs_may_remount_ro(struct super_block *sb) | |||
271 | file_list_lock(); | 271 | file_list_lock(); |
272 | list_for_each(p, &sb->s_files) { | 272 | list_for_each(p, &sb->s_files) { |
273 | struct file *file = list_entry(p, struct file, f_u.fu_list); | 273 | struct file *file = list_entry(p, struct file, f_u.fu_list); |
274 | struct inode *inode = file->f_dentry->d_inode; | 274 | struct inode *inode = file->f_path.dentry->d_inode; |
275 | 275 | ||
276 | /* File with pending delete? */ | 276 | /* File with pending delete? */ |
277 | if (inode->i_nlink == 0) | 277 | if (inode->i_nlink == 0) |