Merge commit 'v2.6.32-rc7'

Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.
This commit is contained in:
Eric W. Biederman 2009-11-17 01:01:34 -08:00
commit bb9074ff58
381 changed files with 6994 additions and 3628 deletions

View file

@ -2597,8 +2597,7 @@ static void proc_flush_task_mnt(struct vfsmount *mnt, pid_t pid, pid_t tgid)
name.len = snprintf(buf, sizeof(buf), "%d", pid);
dentry = d_hash_and_lookup(mnt->mnt_root, &name);
if (dentry) {
if (!(current->flags & PF_EXITING))
shrink_dcache_parent(dentry);
shrink_dcache_parent(dentry);
d_drop(dentry);
dput(dentry);
}