[PATCH 09/32] SUNRPC: Clean up rpc_pipefs lookup code...

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
---
 net/sunrpc/rpc_pipe.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 8fa7182..2940b92 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -484,12 +484,12 @@ static const struct dentry_operations rpc_dentry_operations = {
 	.d_delete = rpc_delete_dentry,
 };
 
-static int
-rpc_lookup_parent(char *path, struct nameidata *nd)
+static int __rpc_lookup_path(const char *pathname, unsigned flags,
+			     struct nameidata *nd)
 {
 	struct vfsmount *mnt;
 
-	if (path[0] == '\0')
+	if (pathname[0] == '\0')
 		return -ENOENT;
 
 	mnt = rpc_get_mount();
@@ -499,15 +499,20 @@ rpc_lookup_parent(char *path, struct nameidata *nd)
 		return PTR_ERR(mnt);
 	}
 
-	if (vfs_path_lookup(mnt->mnt_root, mnt, path, LOOKUP_PARENT, nd)) {
+	if (vfs_path_lookup(mnt->mnt_root, mnt, pathname, flags, nd)) {
 		printk(KERN_WARNING "%s: %s failed to find path %s\n",
-				__FILE__, __func__, path);
+				__FILE__, __func__, pathname);
 		rpc_put_mount();
 		return -ENOENT;
 	}
 	return 0;
 }
 
+static int rpc_lookup_parent(const char *pathname, struct nameidata *nd)
+{
+	return __rpc_lookup_path(pathname, LOOKUP_PARENT, nd);
+}
+
 static void
 rpc_release_path(struct nameidata *nd)
 {
-- 
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux