aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6/xfs_ioctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl.c')
-rw-r--r--fs/xfs/linux-2.6/xfs_ioctl.c10
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));