Merge branch 'write_inode2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro...

[safe/jmp/linux-2.6] / fs / afs / security.c

diff --git a/fs/afs/security.c b/fs/afs/security.c
index 9446a1f..3ef5043 100644 (file)
--- a/fs/afs/security.c
+++ b/fs/afs/security.c
@@ -284,10 +284,10 @@ static int afs_check_permit(struct afs_vnode *vnode, struct key *key,
  * - AFS ACLs are attached to directories only, and a file is controlled by its
  *   parent directory's ACL
  */
-int afs_permission(struct inode *inode, int mask, struct nameidata *nd)
+int afs_permission(struct inode *inode, int mask)
 {
        struct afs_vnode *vnode = AFS_FS_I(inode);
-       afs_access_t access;
+       afs_access_t uninitialized_var(access);
        struct key *key;
        int ret;