lockd: Remove FL_LOCKD flag

Currently lockd identifies its own locks using the FL_LOCKD flag.  This
doesn't scale well to multiple lock managers--if we did this in nfsv4 too,
for example, we'd be left with only one free flag bit.

Instead, we just check whether the file manager ops (fl_lmops) set on this
lock are our own.

The only use for this is in nlm_traverse_locks, which uses it to find locks
that need cleaning up when freeing a host or a file.

In the long run it might be nice to do reference counting instead of
traversing all the locks like this....

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 1 insertions, 3 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 */