1 files changed, 3 insertions, 4 deletions

diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 62f4a385177f..c7a6e3ae44d6 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -182,7 +182,7 @@ nlm_traverse_locks(struct nlm_host *host, struct nlm_file *file, int action)
 again:
         file->f_locks = 0;
         for (fl = inode->i_flock; fl; fl = fl->fl_next) {
-                if (!(fl->fl_flags & FL_LOCKD))
+                if (fl->fl_lmops != &nlmsvc_lock_operations)
                         continue;
 
                 /* update current lock count */
@@ -224,9 +224,8 @@ nlm_inspect_file(struct nlm_host *host, struct nlm_file *file, int action)
                 if (file->f_count || file->f_blocks || file->f_shares)
                         return 1;
         } else {
-                if (nlmsvc_traverse_blocks(host, file, action)
-                 || nlmsvc_traverse_shares(host, file, action))
-                        return 1;
+                nlmsvc_traverse_blocks(host, file, action);
+                nlmsvc_traverse_shares(host, file, action);
         }
         return nlm_traverse_locks(host, file, action);
 }