From 777933fb10e68fb766cadd789eefc17ae8020e63 Mon Sep 17 00:00:00 2001
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Thu, 31 May 2012 16:26:18 -0700
Subject: [PATCH] --- yaml --- r: 309737 b: refs/heads/master c:
 2344bec788b097b2d1198758bd29c583812b864e h: refs/heads/master i:   309735:
 a069790f5259ff4497f9393cbaa98377ccee0e10 v: v3

---
 [refs]               | 2 +-
 trunk/fs/proc/base.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0dabcbcef1b1..7ffed442dfe2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7dcd9990e42ccfc798d4eb55e2dbf9d7d434c6b
+refs/heads/master: 2344bec788b097b2d1198758bd29c583812b864e
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index cca635d252d4..155dee600ed4 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -2022,11 +2022,8 @@ static int map_files_d_revalidate(struct dentry *dentry, struct nameidata *nd)
 	if (!task)
 		goto out_notask;
 
-	if (!ptrace_may_access(task, PTRACE_MODE_READ))
-		goto out;
-
-	mm = get_task_mm(task);
-	if (!mm)
+	mm = mm_access(task, PTRACE_MODE_READ);
+	if (IS_ERR_OR_NULL(mm))
 		goto out;
 
 	if (!dname_to_vma_addr(dentry, &vm_start, &vm_end)) {