summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-25 12:25:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-25 12:25:38 -0700
commit4d4323ea2dbb506a29260a41b554dfc7de79249e (patch)
treec79ad1c770bd8b44f4afd3e5e4b5745bbdd42a6a /fs/proc
parent8495e9c4a9616c9d19f23182d0536485902259db (diff)
parent52e220d357a38cb29fa2e29f34ed94c1d66357f4 (diff)
downloadlinux-4d4323ea2dbb506a29260a41b554dfc7de79249e.tar.gz
linux-4d4323ea2dbb506a29260a41b554dfc7de79249e.tar.bz2
linux-4d4323ea2dbb506a29260a41b554dfc7de79249e.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro: "Assorted fixes from the last week or so" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: VFS: collect_mounts() should return an ERR_PTR bfs: iget_locked() doesn't return an ERR_PTR efs: iget_locked() doesn't return an ERR_PTR() proc: kill the extra proc_readfd_common()->dir_emit_dots() cope with potentially long ->d_dname() output for shmem/hugetlb
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/fd.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 75f2890abbd8..0ff80f9b930f 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -230,8 +230,6 @@ static int proc_readfd_common(struct file *file, struct dir_context *ctx,
if (!dir_emit_dots(file, ctx))
goto out;
- if (!dir_emit_dots(file, ctx))
- goto out;
files = get_files_struct(p);
if (!files)
goto out;