Skip to content

Commit

Permalink
xfs: use ->readlink to implement the readlink_by_handle ioctl
Browse files Browse the repository at this point in the history
Also drop the now unused readlink_copy export.

[dchinner: use d_inode(dentry) rather than dentry->d_inode]

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
  • Loading branch information
Christoph Hellwig authored and Dave Chinner committed Apr 5, 2016
1 parent 2b3d1d4 commit bfe8804
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
1 change: 0 additions & 1 deletion fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -4515,7 +4515,6 @@ int readlink_copy(char __user *buffer, int buflen, const char *link)
out:
return len;
}
EXPORT_SYMBOL(readlink_copy);

/*
* A helper for ->readlink(). This should be used *ONLY* for symlinks that
Expand Down
18 changes: 2 additions & 16 deletions fs/xfs/xfs_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ xfs_readlink_by_handle(
{
struct dentry *dentry;
__u32 olen;
void *link;
int error;

if (!capable(CAP_SYS_ADMIN))
Expand All @@ -288,7 +287,7 @@ xfs_readlink_by_handle(
return PTR_ERR(dentry);

/* Restrict this handle operation to symlinks only. */
if (!d_is_symlink(dentry)) {
if (!d_inode(dentry)->i_op->readlink) {
error = -EINVAL;
goto out_dput;
}
Expand All @@ -298,21 +297,8 @@ xfs_readlink_by_handle(
goto out_dput;
}

link = kmalloc(MAXPATHLEN+1, GFP_KERNEL);
if (!link) {
error = -ENOMEM;
goto out_dput;
}

error = xfs_readlink(XFS_I(d_inode(dentry)), link);
if (error)
goto out_kfree;
error = readlink_copy(hreq->ohandle, olen, link);
if (error)
goto out_kfree;
error = d_inode(dentry)->i_op->readlink(dentry, hreq->ohandle, olen);

out_kfree:
kfree(link);
out_dput:
dput(dentry);
return error;
Expand Down

0 comments on commit bfe8804

Please sign in to comment.