3 files changed, 1 insertions, 4 deletions

diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index d683dd022e08..d50946dcddd9 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -313,8 +313,6 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
         /* Get existing block (in case client is busy-waiting) */
         block = nlmsvc_lookup_block(file, lock, 0);
 
-        lock->fl.fl_flags |= FL_LOCKD;
-
 again:
         /* Lock file against concurrent access */
         down(&file->f_sema);
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 62f4a385177f..601e5b3dfe20 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 */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 8ef4dd788a83..d2cffee8fc11 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -667,7 +667,6 @@ extern spinlock_t files_lock;
 #define FL_POSIX        1
 #define FL_FLOCK        2
 #define FL_ACCESS       8       /* not trying to lock, just looking */
-#define FL_LOCKD        16      /* lock held by rpc.lockd */
 #define FL_LEASE        32      /* lease held on this file */
 #define FL_SLEEP        128     /* A blocking lock */