Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfe8804d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner
Browse files

xfs: use ->readlink to implement the readlink_by_handle ioctl 



Also drop the now unused readlink_copy export.

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

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 2b3d1d41

fs/namei.c

+0 −1
Original line number Diff line number Diff line
@@ -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

fs/xfs/xfs_ioctl.c

+2 −16
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ xfs_readlink_by_handle( 
{

	struct dentry		*dentry;

	__u32			olen;

	void			*link;

	int			error;



	if (!capable(CAP_SYS_ADMIN))
@@ -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;

	}
@@ -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 = d_inode(dentry)->i_op->readlink(dentry, hreq->ohandle, olen);



	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;



 out_kfree:

	kfree(link);

 out_dput:

	dput(dentry);

	return error;