This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / nfs / dir.c

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 0547efd..296761b 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -31,7 +31,6 @@
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/namei.h>
-#include <linux/vserver/xid.h>
 
 #include "delegation.h"
 
@@ -760,7 +759,6 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
        inode = nfs_fhget(dentry->d_sb, &fhandle, &fattr);
        if (!inode)
                goto out_unlock;
-       vx_propagate_xid(nd, inode);
 no_entry:
        error = 0;
        d_add(dentry, inode);
@@ -1601,7 +1599,7 @@ int nfs_permission(struct inode *inode, int mask, struct nameidata *nd)
        return res;
 out_notsup:
        nfs_revalidate_inode(NFS_SERVER(inode), inode);
-       res = generic_permission(inode, mask, NULL);
+       res = vfs_permission(inode, mask);
        unlock_kernel();
        return res;
 }