[PATCH] sanitize lookup_hash prototype

->permission and ->lookup have a struct nameidata * argument these days to
pass down lookup intents.  Unfortunately some callers of lookup_hash don't
actually pass this one down.  For lookup_one_len() we don't have a struct
nameidata to pass down, but as this function is a library function only
used by filesystem code this is an acceptable limitation.  All other
callers should pass down the nameidata, so this patch changes the
lookup_hash interface to only take a struct nameidata argument and derives
the other two arguments to __lookup_hash from it.  All callers already have
the nameidata argument available so this is not a problem.

At the same time I'd like to deprecate the lookup_hash interface as there
are better exported interfaces for filesystem usage.  Before it can
actually be removed I need to fix up rpc_pipefs.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Ram Pai <linuxram@us.ibm.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Al Viro <viro@ftp.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 4f188d0a5d11..81e00a6c19de 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -603,7 +603,7 @@ rpc_lookup_negative(char *path, struct nameidata *nd)
                 return ERR_PTR(error);
         dir = nd->dentry->d_inode;
         down(&dir->i_sem);
-        dentry = lookup_hash(&nd->last, nd->dentry);
+        dentry = lookup_hash(nd);
         if (IS_ERR(dentry))
                 goto out_err;
         if (dentry->d_inode) {
@@ -665,7 +665,7 @@ rpc_rmdir(char *path)
                 return error;
         dir = nd.dentry->d_inode;
         down(&dir->i_sem);
-        dentry = lookup_hash(&nd.last, nd.dentry);
+        dentry = lookup_hash(&nd);
         if (IS_ERR(dentry)) {
                 error = PTR_ERR(dentry);
                 goto out_release;
@@ -726,7 +726,7 @@ rpc_unlink(char *path)
                 return error;
         dir = nd.dentry->d_inode;
         down(&dir->i_sem);
-        dentry = lookup_hash(&nd.last, nd.dentry);
+        dentry = lookup_hash(&nd);
         if (IS_ERR(dentry)) {
                 error = PTR_ERR(dentry);
                 goto out_release;