diff options
author | Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> | 2006-12-08 05:36:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:43 -0500 |
commit | e678fb0d523c118fc2f903d62cb54c89b6b68185 (patch) | |
tree | 11ba523e5c9b4eeb7b96a9cb4b13800df87cd53c /fs/xfs/linux-2.6/xfs_ioctl.c | |
parent | bd243a4b4b028d65a8178db5b57f8ed2cfc9707d (diff) |
[PATCH] xfs: 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 xfs
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>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index 74d094829a4d..f011c9cd0d62 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c | |||
@@ -107,9 +107,9 @@ xfs_find_handle( | |||
107 | if (!file) | 107 | if (!file) |
108 | return -EBADF; | 108 | return -EBADF; |
109 | 109 | ||
110 | ASSERT(file->f_dentry); | 110 | ASSERT(file->f_path.dentry); |
111 | ASSERT(file->f_dentry->d_inode); | 111 | ASSERT(file->f_path.dentry->d_inode); |
112 | inode = igrab(file->f_dentry->d_inode); | 112 | inode = igrab(file->f_path.dentry->d_inode); |
113 | fput(file); | 113 | fput(file); |
114 | break; | 114 | break; |
115 | } | 115 | } |
@@ -333,10 +333,10 @@ xfs_open_by_handle( | |||
333 | } | 333 | } |
334 | 334 | ||
335 | /* Ensure umount returns EBUSY on umounts while this file is open. */ | 335 | /* Ensure umount returns EBUSY on umounts while this file is open. */ |
336 | mntget(parfilp->f_vfsmnt); | 336 | mntget(parfilp->f_path.mnt); |
337 | 337 | ||
338 | /* Create file pointer. */ | 338 | /* Create file pointer. */ |
339 | filp = dentry_open(dentry, parfilp->f_vfsmnt, hreq.oflags); | 339 | filp = dentry_open(dentry, parfilp->f_path.mnt, hreq.oflags); |
340 | if (IS_ERR(filp)) { | 340 | if (IS_ERR(filp)) { |
341 | put_unused_fd(new_fd); | 341 | put_unused_fd(new_fd); |
342 | return -XFS_ERROR(-PTR_ERR(filp)); | 342 | return -XFS_ERROR(-PTR_ERR(filp)); |