The patch titled
Subject: proc-show-locks-in-proc-pid-fdinfo-x-v2
has been added to the -mm tree. Its filename is
proc-show-locks-in-proc-pid-fdinfo-x-v2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/proc-show-locks-in-proc-pid-fdinfo-x-v2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/proc-show-locks-in-proc-pid-fdinfo-x-v2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrey Vagin <avagin@xxxxxxxxxx>
Subject: proc-show-locks-in-proc-pid-fdinfo-x-v2
use seq_has_overflowed() properly
Signed-off-by: Andrey Vagin <avagin@xxxxxxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Cc: Pavel Emelyanov <xemul@xxxxxxxxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/fd.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff -puN fs/proc/fd.c~proc-show-locks-in-proc-pid-fdinfo-x-v2 fs/proc/fd.c
--- a/fs/proc/fd.c~proc-show-locks-in-proc-pid-fdinfo-x-v2
+++ a/fs/proc/fd.c
@@ -57,17 +57,15 @@ static int seq_show(struct seq_file *m,
real_mount(file->f_path.mnt)->mnt_id);
show_fd_locks(m, file, files);
- ret = seq_has_overflowed(m);
- if (ret)
+ if (seq_has_overflowed(m))
goto out;
if (file->f_op->show_fdinfo)
file->f_op->show_fdinfo(m, file);
- ret = seq_has_overflowed(m);
out:
fput(file);
- return ret;
+ return 0;
}
static int seq_fdinfo_open(struct inode *inode, struct file *file)
_
Patches currently in -mm which might be from avagin@xxxxxxxxxx are
proc-show-locks-in-proc-pid-fdinfo-x.patch
proc-show-locks-in-proc-pid-fdinfo-x-v2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
