1 files changed, 17 insertions, 10 deletions

diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 8e5ad83b629a..af84ad04df77 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -8,6 +8,7 @@
 #include <linux/security.h>
 #include <linux/file.h>
 #include <linux/seq_file.h>
+#include <linux/fs.h>
 
 #include <linux/proc_fs.h>
 
@@ -48,17 +49,23 @@ static int seq_show(struct seq_file *m, void *v)
                 put_files_struct(files);
         }
 
-        if (!ret) {
-                seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\n",
-                           (long long)file->f_pos, f_flags,
-                           real_mount(file->f_path.mnt)->mnt_id);
-                if (file->f_op->show_fdinfo)
-                        file->f_op->show_fdinfo(m, file);
-                ret = seq_has_overflowed(m);
-                fput(file);
-        }
+        if (ret)
+                return ret;
 
-        return ret;
+        seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\n",
+                   (long long)file->f_pos, f_flags,
+                   real_mount(file->f_path.mnt)->mnt_id);
+
+        show_fd_locks(m, file, files);
+        if (seq_has_overflowed(m))
+                goto out;
+
+        if (file->f_op->show_fdinfo)
+                file->f_op->show_fdinfo(m, file);
+
+out:
+        fput(file);
+        return 0;
 }
 
 static int seq_fdinfo_open(struct inode *inode, struct file *file)