From: Christoph Hellwig <hch@lst.de>
To: xfs@oss.sgi.com
Cc: viro@zeniv.linux.org.uk
Subject: [PATCH 4/5] xfs: use ->readlink to implement the readlink_by_handle ioctl
Date: Sun, 3 May 2015 11:13:52 +0200 [thread overview]
Message-ID: <1430644433-26658-5-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1430644433-26658-1-git-send-email-hch@lst.de>
Also drop the now unused readlink_copy export.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/namei.c | 1 -
fs/xfs/xfs_ioctl.c | 19 ++-----------------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index c83145a..482c6a9 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -4420,7 +4420,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
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 5f4a396..597609e 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -276,7 +276,6 @@ xfs_readlink_by_handle(
{
struct dentry *dentry;
__u32 olen;
- void *link;
int error;
if (!capable(CAP_SYS_ADMIN))
@@ -287,7 +286,7 @@ xfs_readlink_by_handle(
return PTR_ERR(dentry);
/* Restrict this handle operation to symlinks only. */
- if (!d_is_symlink(dentry)) {
+ if (!dentry->d_inode->i_op->readlink) {
error = -EINVAL;
goto out_dput;
}
@@ -297,21 +296,7 @@ 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(dentry->d_inode), link);
- if (error)
- goto out_kfree;
- error = readlink_copy(hreq->ohandle, olen, link);
- if (error)
- goto out_kfree;
-
- out_kfree:
- kfree(link);
+ error = dentry->d_inode->i_op->readlink(dentry, hreq->ohandle, olen);
out_dput:
dput(dentry);
return error;
--
1.9.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-05-03 9:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-03 9:13 optimize inline symlink handling Christoph Hellwig
2015-05-03 9:13 ` [PATCH 2/5] xfs: factor out a helper to initialize a local format inode fork Christoph Hellwig
2015-05-03 9:13 ` [PATCH 3/5] xfs: set up inode operation vectors later Christoph Hellwig
2015-05-03 9:13 ` Christoph Hellwig [this message]
2015-05-03 9:13 ` [PATCH 5/5] xfs: optimize inline symlinks Christoph Hellwig
2015-05-03 9:18 ` optimize inline symlink handling Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430644433-26658-5-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=viro@zeniv.linux.org.uk \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox