diff options
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
-rw-r--r-- | fs/xfs/xfs_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index c1c3ef88a260..d681e34c2950 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c | |||
@@ -80,7 +80,7 @@ xfs_find_handle( | |||
80 | f = fdget(hreq->fd); | 80 | f = fdget(hreq->fd); |
81 | if (!f.file) | 81 | if (!f.file) |
82 | return -EBADF; | 82 | return -EBADF; |
83 | inode = f.file->f_path.dentry->d_inode; | 83 | inode = file_inode(f.file); |
84 | } else { | 84 | } else { |
85 | error = user_lpath((const char __user *)hreq->path, &path); | 85 | error = user_lpath((const char __user *)hreq->path, &path); |
86 | if (error) | 86 | if (error) |
@@ -168,7 +168,7 @@ xfs_handle_to_dentry( | |||
168 | /* | 168 | /* |
169 | * Only allow handle opens under a directory. | 169 | * Only allow handle opens under a directory. |
170 | */ | 170 | */ |
171 | if (!S_ISDIR(parfilp->f_path.dentry->d_inode->i_mode)) | 171 | if (!S_ISDIR(file_inode(parfilp)->i_mode)) |
172 | return ERR_PTR(-ENOTDIR); | 172 | return ERR_PTR(-ENOTDIR); |
173 | 173 | ||
174 | if (hlen != sizeof(xfs_handle_t)) | 174 | if (hlen != sizeof(xfs_handle_t)) |
@@ -1334,7 +1334,7 @@ xfs_file_ioctl( | |||
1334 | unsigned int cmd, | 1334 | unsigned int cmd, |
1335 | unsigned long p) | 1335 | unsigned long p) |
1336 | { | 1336 | { |
1337 | struct inode *inode = filp->f_path.dentry->d_inode; | 1337 | struct inode *inode = file_inode(filp); |
1338 | struct xfs_inode *ip = XFS_I(inode); | 1338 | struct xfs_inode *ip = XFS_I(inode); |
1339 | struct xfs_mount *mp = ip->i_mount; | 1339 | struct xfs_mount *mp = ip->i_mount; |
1340 | void __user *arg = (void __user *)p; | 1340 | void __user *arg = (void __user *)p; |