aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/base.c10
-rw-r--r--fs/proc/fd.c2
2 files changed, 2 insertions, 10 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 950100e326a1..772efa45a452 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1565,7 +1565,6 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
1565 put_task_struct(task); 1565 put_task_struct(task);
1566 return 1; 1566 return 1;
1567 } 1567 }
1568 d_drop(dentry);
1569 return 0; 1568 return 0;
1570} 1569}
1571 1570
@@ -1702,9 +1701,6 @@ out:
1702 put_task_struct(task); 1701 put_task_struct(task);
1703 1702
1704out_notask: 1703out_notask:
1705 if (status <= 0)
1706 d_drop(dentry);
1707
1708 return status; 1704 return status;
1709} 1705}
1710 1706
@@ -2618,8 +2614,7 @@ static void proc_flush_task_mnt(struct vfsmount *mnt, pid_t pid, pid_t tgid)
2618 /* no ->d_hash() rejects on procfs */ 2614 /* no ->d_hash() rejects on procfs */
2619 dentry = d_hash_and_lookup(mnt->mnt_root, &name); 2615 dentry = d_hash_and_lookup(mnt->mnt_root, &name);
2620 if (dentry) { 2616 if (dentry) {
2621 shrink_dcache_parent(dentry); 2617 d_invalidate(dentry);
2622 d_drop(dentry);
2623 dput(dentry); 2618 dput(dentry);
2624 } 2619 }
2625 2620
@@ -2639,8 +2634,7 @@ static void proc_flush_task_mnt(struct vfsmount *mnt, pid_t pid, pid_t tgid)
2639 name.len = snprintf(buf, sizeof(buf), "%d", pid); 2634 name.len = snprintf(buf, sizeof(buf), "%d", pid);
2640 dentry = d_hash_and_lookup(dir, &name); 2635 dentry = d_hash_and_lookup(dir, &name);
2641 if (dentry) { 2636 if (dentry) {
2642 shrink_dcache_parent(dentry); 2637 d_invalidate(dentry);
2643 d_drop(dentry);
2644 dput(dentry); 2638 dput(dentry);
2645 } 2639 }
2646 2640
diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 955bb55fab8c..e11d7c590bb0 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -129,8 +129,6 @@ static int tid_fd_revalidate(struct dentry *dentry, unsigned int flags)
129 } 129 }
130 put_task_struct(task); 130 put_task_struct(task);
131 } 131 }
132
133 d_drop(dentry);
134 return 0; 132 return 0;
135} 133}
136 134