diff --git a/[refs] b/[refs]
index b64fc1b6b4ca..22f78911d54d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7364af6a2d5e708b5c6fee3cce08d1bd7b27c9f1
+refs/heads/master: b5bb61da2efe7519eedd6a8f3830ab33ab774b83
diff --git a/trunk/net/sunrpc/rpc_pipe.c b/trunk/net/sunrpc/rpc_pipe.c
index 8fa718201e3f..2940b926648c 100644
--- a/trunk/net/sunrpc/rpc_pipe.c
+++ b/trunk/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)
 {