mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

stop passing nameidata * to ->d_revalidate() 

Just the lookup flags.  Die, bastard, die...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-06-10 16:03:43 -04:00
parent fa3c56bbda
commit 0b728e1911
25 changed files with 74 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/filesystems/Locking
View File

@ -9,7 +9,7 @@ be able to use diff(1).
--------------------------- dentry_operations -------------------------- --------------------------- dentry_operations --------------------------
prototypes: prototypes:
int (*d_revalidate)(struct dentry *, struct nameidata *); int (*d_revalidate)(struct dentry *, unsigned int);
int (*d_hash)(const struct dentry *, const struct inode *, int (*d_hash)(const struct dentry *, const struct inode *,
struct qstr *); struct qstr *);
int (*d_compare)(const struct dentry *, const struct inode *, int (*d_compare)(const struct dentry *, const struct inode *,

5
Documentation/filesystems/porting
View File

@ -431,3 +431,8 @@ release it yourself.
d_alloc_root() is gone, along with a lot of bugs caused by code d_alloc_root() is gone, along with a lot of bugs caused by code
misusing it. Replacement: d_make_root(inode). The difference is, misusing it. Replacement: d_make_root(inode). The difference is,
d_make_root() drops the reference to inode if dentry allocation fails. d_make_root() drops the reference to inode if dentry allocation fails.
--
[mandatory]
The witch is dead! Well, 1/3 of it, anyway. ->d_revalidate() does *not*
take struct nameidata anymore; just the flags.

8
Documentation/filesystems/vfs.txt
View File

@ -902,7 +902,7 @@ the VFS uses a default. As of kernel 2.6.22, the following members are
defined: defined:
struct dentry_operations { struct dentry_operations {
int (*d_revalidate)(struct dentry *, struct nameidata *); int (*d_revalidate)(struct dentry *, unsigned int);
int (*d_hash)(const struct dentry *, const struct inode *, int (*d_hash)(const struct dentry *, const struct inode *,
struct qstr *); struct qstr *);
int (*d_compare)(const struct dentry *, const struct inode *, int (*d_compare)(const struct dentry *, const struct inode *,
@ -921,11 +921,11 @@ struct dentry_operations {
dcache. Most filesystems leave this as NULL, because all their dcache. Most filesystems leave this as NULL, because all their
dentries in the dcache are valid dentries in the dcache are valid
d_revalidate may be called in rcu-walk mode (nd->flags & LOOKUP_RCU). d_revalidate may be called in rcu-walk mode (flags & LOOKUP_RCU).
If in rcu-walk mode, the filesystem must revalidate the dentry without If in rcu-walk mode, the filesystem must revalidate the dentry without
blocking or storing to the dentry, d_parent and d_inode should not be blocking or storing to the dentry, d_parent and d_inode should not be
used without care (because they can go NULL), instead nd->inode should used without care (because they can change and, in d_inode case, even
be used. become NULL under us).
If a situation is encountered that rcu-walk cannot handle, return If a situation is encountered that rcu-walk cannot handle, return
-ECHILD and it will be called again in ref-walk mode. -ECHILD and it will be called again in ref-walk mode.

4
fs/9p/vfs_dentry.c
View File

@ -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 p9_fid *fid;
struct inode *inode; struct inode *inode;
struct v9fs_inode *v9inode; struct v9fs_inode *v9inode;
if (nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
inode = dentry->d_inode; inode = dentry->d_inode;

6
fs/afs/dir.c
View File

@ -23,7 +23,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry,
struct nameidata *nd); struct nameidata *nd);
static int afs_dir_open(struct inode *inode, struct file *file); static int afs_dir_open(struct inode *inode, struct file *file);
static int afs_readdir(struct file *file, void *dirent, filldir_t filldir); static int afs_readdir(struct file *file, void *dirent, filldir_t filldir);
static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd); static int afs_d_revalidate(struct dentry *dentry, unsigned int flags);
static int afs_d_delete(const struct dentry *dentry); static int afs_d_delete(const struct dentry *dentry);
static void afs_d_release(struct dentry *dentry); static void afs_d_release(struct dentry *dentry);
static int afs_lookup_filldir(void *_cookie, const char *name, int nlen, static int afs_lookup_filldir(void *_cookie, const char *name, int nlen,
@ -598,7 +598,7 @@ success:
* - NOTE! the hit can be a negative hit too, so we can't assume we have an * - NOTE! the hit can be a negative hit too, so we can't assume we have an
* inode * inode
*/ */
static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd) static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)
{ {
struct afs_vnode *vnode, *dir; struct afs_vnode *vnode, *dir;
struct afs_fid uninitialized_var(fid); struct afs_fid uninitialized_var(fid);
@ -607,7 +607,7 @@ static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd)
void *dir_version; void *dir_version;
int ret; int ret;
if (nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
vnode = AFS_FS_I(dentry->d_inode); vnode = AFS_FS_I(dentry->d_inode);

6
fs/ceph/dir.c
View File

@ -1042,12 +1042,12 @@ static int dir_lease_is_valid(struct inode *dir, struct dentry *dentry)
/* /*
* Check if cached dentry can be trusted. * Check if cached dentry can be trusted.
*/ */
static int ceph_d_revalidate(struct dentry *dentry, struct nameidata *nd) static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)
{ {
int valid = 0; int valid = 0;
struct inode *dir; struct inode *dir;
if (nd && nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
dout("d_revalidate %p '%.*s' inode %p offset %lld\n", dentry, dout("d_revalidate %p '%.*s' inode %p offset %lld\n", dentry,
@ -1094,7 +1094,7 @@ static void ceph_d_release(struct dentry *dentry)
} }
static int ceph_snapdir_d_revalidate(struct dentry *dentry, static int ceph_snapdir_d_revalidate(struct dentry *dentry,
struct nameidata *nd) unsigned int flags)
{ {
/* /*
* Eventually, we'll want to revalidate snapped metadata * Eventually, we'll want to revalidate snapped metadata

8
fs/cifs/dir.c
View File

@ -700,9 +700,9 @@ lookup_out:
} }
static int static int
cifs_d_revalidate(struct dentry *direntry, struct nameidata *nd) cifs_d_revalidate(struct dentry *direntry, unsigned int flags)
{ {
if (nd && (nd->flags & LOOKUP_RCU)) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
if (direntry->d_inode) { if (direntry->d_inode) {
@ -731,7 +731,7 @@ cifs_d_revalidate(struct dentry *direntry, struct nameidata *nd)
* This may be nfsd (or something), anyway, we can't see the * This may be nfsd (or something), anyway, we can't see the
* intent of this. So, since this can be for creation, drop it. * intent of this. So, since this can be for creation, drop it.
*/ */
if (!nd) if (!flags)
return 0; return 0;
/* /*
@ -739,7 +739,7 @@ cifs_d_revalidate(struct dentry *direntry, struct nameidata *nd)
* case sensitive name which is specified by user if this is * case sensitive name which is specified by user if this is
* for creation. * for creation.
*/ */
if (nd->flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
return 0; return 0;
if (time_after(jiffies, direntry->d_time + HZ) || !lookupCacheEnabled) if (time_after(jiffies, direntry->d_time + HZ) || !lookupCacheEnabled)

6
fs/coda/dir.c
View File

@ -46,7 +46,7 @@ static int coda_rename(struct inode *old_inode, struct dentry *old_dentry,
static int coda_readdir(struct file *file, void *buf, filldir_t filldir); static int coda_readdir(struct file *file, void *buf, filldir_t filldir);
/* dentry ops */ /* dentry ops */
static int coda_dentry_revalidate(struct dentry *de, struct nameidata *nd); static int coda_dentry_revalidate(struct dentry *de, unsigned int flags);
static int coda_dentry_delete(const struct dentry *); static int coda_dentry_delete(const struct dentry *);
/* support routines */ /* support routines */
@ -536,12 +536,12 @@ out:
} }
/* called when a cache lookup succeeds */ /* called when a cache lookup succeeds */
static int coda_dentry_revalidate(struct dentry *de, struct nameidata *nd) static int coda_dentry_revalidate(struct dentry *de, unsigned int flags)
{ {
struct inode *inode; struct inode *inode;
struct coda_inode_info *cii; struct coda_inode_info *cii;
if (nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
inode = de->d_inode; inode = de->d_inode;

20
fs/ecryptfs/dentry.c
View File

@ -32,7 +32,7 @@
/** /**
* ecryptfs_d_revalidate - revalidate an ecryptfs dentry * ecryptfs_d_revalidate - revalidate an ecryptfs dentry
* @dentry: The ecryptfs dentry * @dentry: The ecryptfs dentry
* @nd: The associated nameidata * @flags: lookup flags
* *
* Called when the VFS needs to revalidate a dentry. This * Called when the VFS needs to revalidate a dentry. This
* is called whenever a name lookup finds a dentry in the * is called whenever a name lookup finds a dentry in the
@ -42,32 +42,20 @@
* Returns 1 if valid, 0 otherwise. * Returns 1 if valid, 0 otherwise.
* *
*/ */
static int ecryptfs_d_revalidate(struct dentry *dentry, struct nameidata *nd) static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags)
{ {
struct dentry *lower_dentry; struct dentry *lower_dentry;
struct vfsmount *lower_mnt; struct vfsmount *lower_mnt;
struct dentry *dentry_save = NULL;
struct vfsmount *vfsmount_save = NULL;
int rc = 1; int rc = 1;
if (nd && nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
lower_dentry = ecryptfs_dentry_to_lower(dentry); lower_dentry = ecryptfs_dentry_to_lower(dentry);
lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry); lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);
if (!lower_dentry->d_op || !lower_dentry->d_op->d_revalidate) if (!lower_dentry->d_op || !lower_dentry->d_op->d_revalidate)
goto out; goto out;
if (nd) { rc = lower_dentry->d_op->d_revalidate(lower_dentry, flags);
dentry_save = nd->path.dentry;
vfsmount_save = nd->path.mnt;
nd->path.dentry = lower_dentry;
nd->path.mnt = lower_mnt;
}
rc = lower_dentry->d_op->d_revalidate(lower_dentry, nd);
if (nd) {
nd->path.dentry = dentry_save;
nd->path.mnt = vfsmount_save;
}
if (dentry->d_inode) { if (dentry->d_inode) {
struct inode *lower_inode = struct inode *lower_inode =
ecryptfs_inode_to_lower(dentry->d_inode); ecryptfs_inode_to_lower(dentry->d_inode);

12
fs/fat/namei_vfat.c
View File

@ -41,9 +41,9 @@ static int vfat_revalidate_shortname(struct dentry *dentry)
return ret; return ret;
} }
static int vfat_revalidate(struct dentry *dentry, struct nameidata *nd) static int vfat_revalidate(struct dentry *dentry, unsigned int flags)
{ {
if (nd && nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
/* This is not negative dentry. Always valid. */ /* This is not negative dentry. Always valid. */
@ -52,9 +52,9 @@ static int vfat_revalidate(struct dentry *dentry, struct nameidata *nd)
return vfat_revalidate_shortname(dentry); return vfat_revalidate_shortname(dentry);
} }
static int vfat_revalidate_ci(struct dentry *dentry, struct nameidata *nd) static int vfat_revalidate_ci(struct dentry *dentry, unsigned int flags)
{ {
if (nd && nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
/* /*
@ -74,7 +74,7 @@ static int vfat_revalidate_ci(struct dentry *dentry, struct nameidata *nd)
* This may be nfsd (or something), anyway, we can't see the * This may be nfsd (or something), anyway, we can't see the
* intent of this. So, since this can be for creation, drop it. * intent of this. So, since this can be for creation, drop it.
*/ */
if (!nd) if (!flags)
return 0; return 0;
/* /*
@ -82,7 +82,7 @@ static int vfat_revalidate_ci(struct dentry *dentry, struct nameidata *nd)
* case sensitive name which is specified by user if this is * case sensitive name which is specified by user if this is
* for creation. * for creation.
*/ */
if (nd->flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
return 0; return 0;
return vfat_revalidate_shortname(dentry); return vfat_revalidate_shortname(dentry);

4
fs/fuse/dir.c
View File

@ -154,7 +154,7 @@ u64 fuse_get_attr_version(struct fuse_conn *fc)
* the lookup once more. If the lookup results in the same inode, * the lookup once more. If the lookup results in the same inode,
* then refresh the attributes, timeouts and mark the dentry valid. * then refresh the attributes, timeouts and mark the dentry valid.
*/ */
static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd) static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
{ {
struct inode *inode; struct inode *inode;
@ -174,7 +174,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
if (!inode) if (!inode)
return 0; return 0;
if (nd && (nd->flags & LOOKUP_RCU)) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
fc = get_fuse_conn(inode); fc = get_fuse_conn(inode);

6
fs/gfs2/dentry.c
View File

@ -25,7 +25,7 @@
/** /**
* gfs2_drevalidate - Check directory lookup consistency * gfs2_drevalidate - Check directory lookup consistency
* @dentry: the mapping to check * @dentry: the mapping to check
* @nd: * @flags: lookup flags
* *
* Check to make sure the lookup necessary to arrive at this inode from its * Check to make sure the lookup necessary to arrive at this inode from its
* parent is still good. * parent is still good.
@ -33,7 +33,7 @@
* Returns: 1 if the dentry is ok, 0 if it isn't * Returns: 1 if the dentry is ok, 0 if it isn't
*/ */
static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd) static int gfs2_drevalidate(struct dentry *dentry, unsigned int flags)
{ {
struct dentry *parent; struct dentry *parent;
struct gfs2_sbd *sdp; struct gfs2_sbd *sdp;
@ -44,7 +44,7 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd)
int error; int error;
int had_lock = 0; int had_lock = 0;
if (nd && nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
parent = dget_parent(dentry); parent = dget_parent(dentry);

4
fs/hfs/sysdep.c
View File

@ -13,12 +13,12 @@
/* dentry case-handling: just lowercase everything */ /* dentry case-handling: just lowercase everything */
static int hfs_revalidate_dentry(struct dentry *dentry, struct nameidata *nd) static int hfs_revalidate_dentry(struct dentry *dentry, unsigned int flags)
{ {
struct inode *inode; struct inode *inode;
int diff; int diff;
if (nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
inode = dentry->d_inode; inode = dentry->d_inode;

6
fs/jfs/namei.c
View File

@ -1570,7 +1570,7 @@ out:
return result; return result;
} }
static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd) static int jfs_ci_revalidate(struct dentry *dentry, unsigned int flags)
{ {
/* /*
* This is not negative dentry. Always valid. * This is not negative dentry. Always valid.
@ -1589,7 +1589,7 @@ static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd)
* This may be nfsd (or something), anyway, we can't see the * This may be nfsd (or something), anyway, we can't see the
* intent of this. So, since this can be for creation, drop it. * intent of this. So, since this can be for creation, drop it.
*/ */
if (!nd) if (!flags)
return 0; return 0;
/* /*
@ -1597,7 +1597,7 @@ static int jfs_ci_revalidate(struct dentry *dentry, struct nameidata *nd)
* case sensitive name which is specified by user if this is * case sensitive name which is specified by user if this is
* for creation. * for creation.
*/ */
if (nd->flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
return 0; return 0;
return 1; return 1;
} }

2
fs/namei.c
View File

@ -465,7 +465,7 @@ err_root:
static inline int d_revalidate(struct dentry *dentry, struct nameidata *nd) static inline int d_revalidate(struct dentry *dentry, struct nameidata *nd)
{ {
return dentry->d_op->d_revalidate(dentry, nd); return dentry->d_op->d_revalidate(dentry, nd ? nd->flags : 0);
} }
/** /**

6
fs/ncpfs/dir.c
View File

@ -72,7 +72,7 @@ const struct inode_operations ncp_dir_inode_operations =
/* /*
* Dentry operations routines * Dentry operations routines
*/ */
static int ncp_lookup_validate(struct dentry *, struct nameidata *); static int ncp_lookup_validate(struct dentry *, unsigned int);
static int ncp_hash_dentry(const struct dentry *, const struct inode *, static int ncp_hash_dentry(const struct dentry *, const struct inode *,
struct qstr *); struct qstr *);
static int ncp_compare_dentry(const struct dentry *, const struct inode *, static int ncp_compare_dentry(const struct dentry *, const struct inode *,
@ -290,7 +290,7 @@ leave_me:;
static int static int
ncp_lookup_validate(struct dentry *dentry, struct nameidata *nd) ncp_lookup_validate(struct dentry *dentry, unsigned int flags)
{ {
struct ncp_server *server; struct ncp_server *server;
struct dentry *parent; struct dentry *parent;
@ -302,7 +302,7 @@ ncp_lookup_validate(struct dentry *dentry, struct nameidata *nd)
if (dentry == dentry->d_sb->s_root) if (dentry == dentry->d_sb->s_root)
return 1; return 1;
if (nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
parent = dget_parent(dentry); parent = dget_parent(dentry);

10
fs/nfs/dir.c
View File

@ -1098,9 +1098,8 @@ int nfs_neg_need_reval(struct inode *dir, struct dentry *dentry,
* If the parent directory is seen to have changed, we throw out the * If the parent directory is seen to have changed, we throw out the
* cached dentry and do a new lookup. * cached dentry and do a new lookup.
*/ */
static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd) static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)
{ {
unsigned int flags = nd->flags;
struct inode *dir; struct inode *dir;
struct inode *inode; struct inode *inode;
struct dentry *parent; struct dentry *parent;
@ -1339,7 +1338,7 @@ out:
} }
#ifdef CONFIG_NFS_V4 #ifdef CONFIG_NFS_V4
static int nfs4_lookup_revalidate(struct dentry *, struct nameidata *); static int nfs4_lookup_revalidate(struct dentry *, unsigned int);
const struct dentry_operations nfs4_dentry_operations = { const struct dentry_operations nfs4_dentry_operations = {
.d_revalidate = nfs4_lookup_revalidate, .d_revalidate = nfs4_lookup_revalidate,
@ -1491,9 +1490,8 @@ no_open:
return finish_no_open(file, res); return finish_no_open(file, res);
} }
static int nfs4_lookup_revalidate(struct dentry *dentry, struct nameidata *nd) static int nfs4_lookup_revalidate(struct dentry *dentry, unsigned int flags)
{ {
unsigned int flags = nd->flags;
struct dentry *parent = NULL; struct dentry *parent = NULL;
struct inode *inode; struct inode *inode;
struct inode *dir; struct inode *dir;
@ -1537,7 +1535,7 @@ out:
no_open_dput: no_open_dput:
dput(parent); dput(parent);
no_open: no_open:
return nfs_lookup_revalidate(dentry, nd); return nfs_lookup_revalidate(dentry, flags);
} }
#endif /* CONFIG_NFSV4 */ #endif /* CONFIG_NFSV4 */

5
fs/ocfs2/dcache.c
View File

@ -49,14 +49,13 @@ void ocfs2_dentry_attach_gen(struct dentry *dentry)
} }
static int ocfs2_dentry_revalidate(struct dentry *dentry, static int ocfs2_dentry_revalidate(struct dentry *dentry, unsigned int flags)
struct nameidata *nd)
{ {
struct inode *inode; struct inode *inode;
int ret = 0; /* if all else fails, just return false */ int ret = 0; /* if all else fails, just return false */
struct ocfs2_super *osb; struct ocfs2_super *osb;
if (nd && nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
inode = dentry->d_inode; inode = dentry->d_inode;

22
fs/proc/base.c
View File

@ -1601,13 +1601,13 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
* made this apply to all per process world readable and executable * made this apply to all per process world readable and executable
* directories. * directories.
*/ */
int pid_revalidate(struct dentry *dentry, struct nameidata *nd) int pid_revalidate(struct dentry *dentry, unsigned int flags)
{ {
struct inode *inode; struct inode *inode;
struct task_struct *task; struct task_struct *task;
const struct cred *cred; const struct cred *cred;
if (nd && nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
inode = dentry->d_inode; inode = dentry->d_inode;
@ -1781,7 +1781,7 @@ static int proc_fd_link(struct dentry *dentry, struct path *path)
return proc_fd_info(dentry->d_inode, path, NULL); return proc_fd_info(dentry->d_inode, path, NULL);
} }
static int tid_fd_revalidate(struct dentry *dentry, struct nameidata *nd) static int tid_fd_revalidate(struct dentry *dentry, unsigned int flags)
{ {
struct inode *inode; struct inode *inode;
struct task_struct *task; struct task_struct *task;
@ -1789,7 +1789,7 @@ static int tid_fd_revalidate(struct dentry *dentry, struct nameidata *nd)
struct files_struct *files; struct files_struct *files;
const struct cred *cred; const struct cred *cred;
if (nd && nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
inode = dentry->d_inode; inode = dentry->d_inode;
@ -1868,7 +1868,7 @@ static struct dentry *proc_fd_instantiate(struct inode *dir,
d_set_d_op(dentry, &tid_fd_dentry_operations); d_set_d_op(dentry, &tid_fd_dentry_operations);
d_add(dentry, inode); d_add(dentry, inode);
/* Close the race of the process dying before we return the dentry */ /* Close the race of the process dying before we return the dentry */
if (tid_fd_revalidate(dentry, NULL)) if (tid_fd_revalidate(dentry, 0))
error = NULL; error = NULL;
out: out:
@ -2003,7 +2003,7 @@ static int dname_to_vma_addr(struct dentry *dentry,
return 0; return 0;
} }
static int map_files_d_revalidate(struct dentry *dentry, struct nameidata *nd) static int map_files_d_revalidate(struct dentry *dentry, unsigned int flags)
{ {
unsigned long vm_start, vm_end; unsigned long vm_start, vm_end;
bool exact_vma_exists = false; bool exact_vma_exists = false;
@ -2013,7 +2013,7 @@ static int map_files_d_revalidate(struct dentry *dentry, struct nameidata *nd)
struct inode *inode; struct inode *inode;
int status = 0; int status = 0;
if (nd && nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
if (!capable(CAP_SYS_ADMIN)) { if (!capable(CAP_SYS_ADMIN)) {
@ -2371,7 +2371,7 @@ static struct dentry *proc_fdinfo_instantiate(struct inode *dir,
d_set_d_op(dentry, &tid_fd_dentry_operations); d_set_d_op(dentry, &tid_fd_dentry_operations);
d_add(dentry, inode); d_add(dentry, inode);
/* Close the race of the process dying before we return the dentry */ /* Close the race of the process dying before we return the dentry */
if (tid_fd_revalidate(dentry, NULL)) if (tid_fd_revalidate(dentry, 0))
error = NULL; error = NULL;
out: out:
@ -2430,7 +2430,7 @@ static struct dentry *proc_pident_instantiate(struct inode *dir,
d_set_d_op(dentry, &pid_dentry_operations); d_set_d_op(dentry, &pid_dentry_operations);
d_add(dentry, inode); d_add(dentry, inode);
/* Close the race of the process dying before we return the dentry */ /* Close the race of the process dying before we return the dentry */
if (pid_revalidate(dentry, NULL)) if (pid_revalidate(dentry, 0))
error = NULL; error = NULL;
out: out:
return error; return error;
@ -3237,7 +3237,7 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
d_add(dentry, inode); d_add(dentry, inode);
/* Close the race of the process dying before we return the dentry */ /* Close the race of the process dying before we return the dentry */
if (pid_revalidate(dentry, NULL)) if (pid_revalidate(dentry, 0))
error = NULL; error = NULL;
out: out:
return error; return error;
@ -3508,7 +3508,7 @@ static struct dentry *proc_task_instantiate(struct inode *dir,
d_add(dentry, inode); d_add(dentry, inode);
/* Close the race of the process dying before we return the dentry */ /* Close the race of the process dying before we return the dentry */
if (pid_revalidate(dentry, NULL)) if (pid_revalidate(dentry, 0))
error = NULL; error = NULL;
out: out:
return error; return error;

2
fs/proc/internal.h
View File

@ -142,7 +142,7 @@ typedef struct dentry *instantiate_t(struct inode *, struct dentry *,
int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir, int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
const char *name, int len, const char *name, int len,
instantiate_t instantiate, struct task_struct *task, const void *ptr); instantiate_t instantiate, struct task_struct *task, const void *ptr);
int pid_revalidate(struct dentry *dentry, struct nameidata *nd); int pid_revalidate(struct dentry *dentry, unsigned int flags);
struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *task); struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *task);
extern const struct dentry_operations pid_dentry_operations; extern const struct dentry_operations pid_dentry_operations;
int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat); int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);

2
fs/proc/namespaces.c
View File

@ -56,7 +56,7 @@ static struct dentry *proc_ns_instantiate(struct inode *dir,
d_set_d_op(dentry, &pid_dentry_operations); d_set_d_op(dentry, &pid_dentry_operations);
d_add(dentry, inode); d_add(dentry, inode);
/* Close the race of the process dying before we return the dentry */ /* Close the race of the process dying before we return the dentry */
if (pid_revalidate(dentry, NULL)) if (pid_revalidate(dentry, 0))
error = NULL; error = NULL;
out: out:
return error; return error;

4
fs/proc/proc_sysctl.c
View File

@ -794,9 +794,9 @@ static const struct inode_operations proc_sys_dir_operations = {
.getattr = proc_sys_getattr, .getattr = proc_sys_getattr,
}; };
static int proc_sys_revalidate(struct dentry *dentry, struct nameidata *nd) static int proc_sys_revalidate(struct dentry *dentry, unsigned int flags)
{ {
if (nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
return !PROC_I(dentry->d_inode)->sysctl->unregistering; return !PROC_I(dentry->d_inode)->sysctl->unregistering;
} }

2
fs/reiserfs/xattr.c
View File

@ -942,7 +942,7 @@ int reiserfs_permission(struct inode *inode, int mask)
return generic_permission(inode, mask); return generic_permission(inode, mask);
} }
static int xattr_hide_revalidate(struct dentry *dentry, struct nameidata *nd) static int xattr_hide_revalidate(struct dentry *dentry, unsigned int flags)
{ {
return -EPERM; return -EPERM;
} }

4
fs/sysfs/dir.c
View File

@ -303,12 +303,12 @@ static int sysfs_dentry_delete(const struct dentry *dentry)
return !!(sd->s_flags & SYSFS_FLAG_REMOVED); return !!(sd->s_flags & SYSFS_FLAG_REMOVED);
} }
static int sysfs_dentry_revalidate(struct dentry *dentry, struct nameidata *nd) static int sysfs_dentry_revalidate(struct dentry *dentry, unsigned int flags)
{ {
struct sysfs_dirent *sd; struct sysfs_dirent *sd;
int is_dir; int is_dir;
if (nd->flags & LOOKUP_RCU) if (flags & LOOKUP_RCU)
return -ECHILD; return -ECHILD;
sd = dentry->d_fsdata; sd = dentry->d_fsdata;

2
include/linux/dcache.h
View File

@ -144,7 +144,7 @@ enum dentry_d_lock_class
}; };
struct dentry_operations { struct dentry_operations {
int (*d_revalidate)(struct dentry *, struct nameidata *); int (*d_revalidate)(struct dentry *, unsigned int);
int (*d_hash)(const struct dentry *, const struct inode *, int (*d_hash)(const struct dentry *, const struct inode *,
struct qstr *); struct qstr *);
int (*d_compare)(const struct dentry *, const struct inode *, int (*d_compare)(const struct dentry *, const struct inode *,