[PATCH 6/6] proc: cleanup proc_flush_task()

From: Eric W . Biederman
Date: Tue Nov 18 2008 - 21:16:17 EST


- shrink_dcache_parent is guaranteed to only flush dcache entries
from the specified superblock. So the the insanely subtle
PF_EXITING check designed to avoid flushing filesystems inodes
that are not safe to call during exit is unecessary.

- The test to avoid excess flushing of dcache entries in proc
got inverted and generally broken for threads, and frankly
all it saved was a single d_hash_and_lookup so there was
very little point to it. So remove the check and keep
the code stupid and correct.

Signed-off-by: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
---
fs/proc/base.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index a4b7cac..e43a013 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2600,15 +2600,11 @@ 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);
}

- if (tgid == 0)
- goto out;
-
name.name = buf;
name.len = snprintf(buf, sizeof(buf), "%d", tgid);
leader = d_hash_and_lookup(mnt->mnt_root, &name);
@@ -2669,13 +2665,12 @@ void proc_flush_task(struct task_struct *task)
struct upid *upid;

pid = task_pid(task);
- if (thread_group_leader(task))
- tgid = task_tgid(task);
+ tgid = task_tgid(task);

for (i = 0; i <= pid->level; i++) {
upid = &pid->numbers[i];
proc_flush_task_mnt(upid->ns->proc_mnt, upid->nr,
- tgid ? tgid->numbers[i].nr : 0);
+ tgid->numbers[i].nr);
}

upid = &pid->numbers[pid->level];
--
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/