* [PATCH] [V4] fs/9p: TREADLINK bugfix
@ 2011-01-06 11:29 M. Mohan Kumar
2011-01-06 15:45 ` Aneesh Kumar K. V
0 siblings, 1 reply; 2+ messages in thread
From: M. Mohan Kumar @ 2011-01-06 11:29 UTC (permalink / raw)
To: v9fs-developer, linux-fsdevel@vger.kernel.org, LKML,
"Aneesh Kumar K. V" <ane
Remove v9fs_vfs_readlink_dotl function and use generic_readlink. Update
v9fs_vfs_follow_link_dotl function to accommodate this change
Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>
Reported-by: Dr. David Alan Gilbert <linux@treblig.org>
---
Changes from previous version:
* Proper error handling and freeing of memory
* Use __getname in v9fs_vfs_follow_link_dotl
* Remove v9fs_vfs_readlink_dotl function
fs/9p/vfs_inode.c | 58 ++++++++++++++++++++--------------------------------
1 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 2ce3668..d6e4def 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -1994,30 +1994,6 @@ error:
return err;
}
-static int
-v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
-{
- int retval;
- struct p9_fid *fid;
- char *target = NULL;
-
- P9_DPRINTK(P9_DEBUG_VFS, " %s\n", dentry->d_name.name);
- retval = -EPERM;
- fid = v9fs_fid_lookup(dentry);
- if (IS_ERR(fid))
- return PTR_ERR(fid);
-
- retval = p9_client_readlink(fid, &target);
- if (retval < 0)
- return retval;
-
- strncpy(buffer, target, buflen);
- P9_DPRINTK(P9_DEBUG_VFS, "%s -> %s\n", dentry->d_name.name, buffer);
-
- retval = strnlen(buffer, buflen);
- return retval;
-}
-
/**
* v9fs_vfs_follow_link_dotl - follow a symlink path
* @dentry: dentry for symlink
@@ -2028,23 +2004,33 @@ v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
static void *
v9fs_vfs_follow_link_dotl(struct dentry *dentry, struct nameidata *nd)
{
- int len = 0;
+ int retval;
+ struct p9_fid *fid;
char *link = __getname();
+ char *target;
- P9_DPRINTK(P9_DEBUG_VFS, "%s n", dentry->d_name.name);
+ P9_DPRINTK(P9_DEBUG_VFS, "%s\n", dentry->d_name.name);
- if (!link)
+ if (!link) {
link = ERR_PTR(-ENOMEM);
- else {
- len = v9fs_vfs_readlink_dotl(dentry, link, PATH_MAX);
- if (len < 0) {
- __putname(link);
- link = ERR_PTR(len);
- } else
- link[min(len, PATH_MAX-1)] = 0;
+ goto ndset;
+ }
+ fid = v9fs_fid_lookup(dentry);
+ if (IS_ERR(fid)) {
+ __putname(link);
+ link = ERR_PTR(fid);
+ goto ndset;
}
+ retval = p9_client_readlink(fid, &target);
+ if (!retval) {
+ strcpy(link, target);
+ kfree(target);
+ goto ndset;
+ }
+ __putname(link);
+ link = ERR_PTR(retval);
+ndset:
nd_set_link(nd, link);
-
return NULL;
}
@@ -2117,7 +2103,7 @@ static const struct inode_operations v9fs_symlink_inode_operations = {
};
static const struct inode_operations v9fs_symlink_inode_operations_dotl = {
- .readlink = v9fs_vfs_readlink_dotl,
+ .readlink = generic_readlink,
.follow_link = v9fs_vfs_follow_link_dotl,
.put_link = v9fs_vfs_put_link,
.getattr = v9fs_vfs_getattr_dotl,
--
1.7.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [V4] fs/9p: TREADLINK bugfix
2011-01-06 11:29 [PATCH] [V4] fs/9p: TREADLINK bugfix M. Mohan Kumar
@ 2011-01-06 15:45 ` Aneesh Kumar K. V
0 siblings, 0 replies; 2+ messages in thread
From: Aneesh Kumar K. V @ 2011-01-06 15:45 UTC (permalink / raw)
To: M. Mohan Kumar, v9fs-developer, linux-fsdevel@vger.kernel.org,
LKML
On Thu, 6 Jan 2011 16:59:31 +0530, "M. Mohan Kumar" <mohan@in.ibm.com> wrote:
> Remove v9fs_vfs_readlink_dotl function and use generic_readlink. Update
> v9fs_vfs_follow_link_dotl function to accommodate this change
>
> Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>
> Reported-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
> Changes from previous version:
> * Proper error handling and freeing of memory
> * Use __getname in v9fs_vfs_follow_link_dotl
> * Remove v9fs_vfs_readlink_dotl function
>
> fs/9p/vfs_inode.c | 58 ++++++++++++++++++++--------------------------------
> 1 files changed, 22 insertions(+), 36 deletions(-)
>
> diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
> index 2ce3668..d6e4def 100644
> --- a/fs/9p/vfs_inode.c
> +++ b/fs/9p/vfs_inode.c
> @@ -1994,30 +1994,6 @@ error:
> return err;
> }
>
> -static int
> -v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
> -{
> - int retval;
> - struct p9_fid *fid;
> - char *target = NULL;
> -
> - P9_DPRINTK(P9_DEBUG_VFS, " %s\n", dentry->d_name.name);
> - retval = -EPERM;
> - fid = v9fs_fid_lookup(dentry);
> - if (IS_ERR(fid))
> - return PTR_ERR(fid);
> -
> - retval = p9_client_readlink(fid, &target);
> - if (retval < 0)
> - return retval;
> -
> - strncpy(buffer, target, buflen);
> - P9_DPRINTK(P9_DEBUG_VFS, "%s -> %s\n", dentry->d_name.name, buffer);
> -
> - retval = strnlen(buffer, buflen);
> - return retval;
> -}
> -
> /**
> * v9fs_vfs_follow_link_dotl - follow a symlink path
> * @dentry: dentry for symlink
> @@ -2028,23 +2004,33 @@ v9fs_vfs_readlink_dotl(struct dentry *dentry, char *buffer, int buflen)
> static void *
> v9fs_vfs_follow_link_dotl(struct dentry *dentry, struct nameidata *nd)
> {
> - int len = 0;
> + int retval;
> + struct p9_fid *fid;
> char *link = __getname();
> + char *target;
>
> - P9_DPRINTK(P9_DEBUG_VFS, "%s n", dentry->d_name.name);
> + P9_DPRINTK(P9_DEBUG_VFS, "%s\n", dentry->d_name.name);
>
> - if (!link)
> + if (!link) {
> link = ERR_PTR(-ENOMEM);
> - else {
> - len = v9fs_vfs_readlink_dotl(dentry, link, PATH_MAX);
> - if (len < 0) {
> - __putname(link);
> - link = ERR_PTR(len);
> - } else
> - link[min(len, PATH_MAX-1)] = 0;
> + goto ndset;
> + }
> + fid = v9fs_fid_lookup(dentry);
> + if (IS_ERR(fid)) {
> + __putname(link);
> + link = ERR_PTR(fid);
> + goto ndset;
> }
> + retval = p9_client_readlink(fid, &target);
> + if (!retval) {
> + strcpy(link, target);
> + kfree(target);
> + goto ndset;
> + }
> + __putname(link);
> + link = ERR_PTR(retval);
> +ndset:
> nd_set_link(nd, link);
> -
> return NULL;
> }
>
> @@ -2117,7 +2103,7 @@ static const struct inode_operations v9fs_symlink_inode_operations = {
> };
>
> static const struct inode_operations v9fs_symlink_inode_operations_dotl = {
> - .readlink = v9fs_vfs_readlink_dotl,
> + .readlink = generic_readlink,
> .follow_link = v9fs_vfs_follow_link_dotl,
> .put_link = v9fs_vfs_put_link,
> .getattr = v9fs_vfs_getattr_dotl,
> --
> 1.7.2.3
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-06 15:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-06 11:29 [PATCH] [V4] fs/9p: TREADLINK bugfix M. Mohan Kumar
2011-01-06 15:45 ` Aneesh Kumar K. V
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).