git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
..
34a3c1f
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/pagemap.h>
#include <linux/smp_lock.h>
#include <linux/namei.h>
-#include <linux/vserver/xid.h>
#include "delegation.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;
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);
no_entry:
error = 0;
d_add(dentry, inode);