[Devel] [PATCH RHEL7 COMMIT] rh/locks: check for fl->fl_owner != filp in show_fd_locks

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-327.18.2.vz7.14.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.18.2.vz7.14.17
------>
commit 71684d5261234b7aa0287dd8fb99b06644147172
Author: Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>
Date:   Wed Jun 22 16:07:48 2016 +0400

    rh/locks: check for fl->fl_owner != filp in show_fd_locks
    
    NFS emulates flocks via posix lock on server and fl->fl_owner is set to filp.
    
    khorenko@: prior to this patch NFS shared locks were not shown in
    fdinfo and thus could not be migrated using CRIU.
    
    https://jira.sw.ru/browse/PSBM-48727
    
    Signed-off-by: Stanislav Kinsburskiy <skinsbursky at virtuozzo.com>
---
 fs/locks.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/locks.c b/fs/locks.c
index cb7da61..a5ab0c0 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2503,6 +2503,7 @@ void show_fd_locks(struct seq_file *f,
 		 * matches ->fl_file.
 		 */
 		if (fl->fl_owner != files &&
+		    fl->fl_owner != (fl_owner_t)filp &&
 		    fl->fl_owner != NULL)
 			continue;