diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-12-08 14:15:26 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-12-08 14:15:29 -0500 |
commit | 8e9255e6a2141e050d51bc4d96dbef494a87d653 (patch) | |
tree | f190b142830153eaab05555a93c4f71a144ba3d4 /fs/proc/base.c | |
parent | 5091faa449ee0b7d73bc296a93bca9540fc51d0a (diff) | |
parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) |
Merge branch 'linus' into sched/core
Merge reason: we want to queue up dependent cleanup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r-- | fs/proc/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 2fa0ce29b6dc..08cba2c3b612 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -1650,7 +1650,7 @@ static int do_proc_readlink(struct path *path, char __user *buffer, int buflen) | |||
1650 | if (!tmp) | 1650 | if (!tmp) |
1651 | return -ENOMEM; | 1651 | return -ENOMEM; |
1652 | 1652 | ||
1653 | pathname = d_path_with_unreachable(path, tmp, PAGE_SIZE); | 1653 | pathname = d_path(path, tmp, PAGE_SIZE); |
1654 | len = PTR_ERR(pathname); | 1654 | len = PTR_ERR(pathname); |
1655 | if (IS_ERR(pathname)) | 1655 | if (IS_ERR(pathname)) |
1656 | goto out; | 1656 | goto out; |