diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-03-31 18:10:34 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2013-03-31 18:10:34 +0200 |
| commit | 70711d223510ba1773cfe1d7770a56141c815ff8 (patch) | |
| tree | 4a71f38a3a554ddecaa31b7d8c6bc49b7d1705b4 /fs/9p/vfs_dentry.c | |
| parent | d53b4ed072d9779cdf53582c46436dec06d0961f (diff) | |
| parent | 19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff) | |
Merge tag 'v3.8' of /home/kaber/src/repos/linux
Linux 3.8
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/linux/Kbuild
include/linux/netlink.h
Diffstat (limited to 'fs/9p/vfs_dentry.c')
| -rw-r--r-- | fs/9p/vfs_dentry.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/9p/vfs_dentry.c b/fs/9p/vfs_dentry.c index d529437ff44..64600b5d052 100644 --- a/fs/9p/vfs_dentry.c +++ b/fs/9p/vfs_dentry.c @@ -100,13 +100,13 @@ static void v9fs_dentry_release(struct dentry *dentry) } } -static int v9fs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd) +static int v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags) { struct p9_fid *fid; struct inode *inode; struct v9fs_inode *v9inode; - if (nd->flags & LOOKUP_RCU) + if (flags & LOOKUP_RCU) return -ECHILD; inode = dentry->d_inode; |