diff options
author | J. Bruce Fields <bfields@fieldses.org> | 2006-03-20 13:44:26 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 13:44:26 -0500 |
commit | 7117bf3dfb10b534a017260d9fc643bc1d0afd2a (patch) | |
tree | a7060dc3d8a5f54c5beb41885620aaf99aac42f9 | |
parent | 8dc7c3115b611c00006eac3ee5b108296432aab7 (diff) |
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>
-rw-r--r-- | fs/lockd/svclock.c | 2 | ||||
-rw-r--r-- | fs/lockd/svcsubs.c | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 1 |
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, | |||
313 | /* Get existing block (in case client is busy-waiting) */ | 313 | /* Get existing block (in case client is busy-waiting) */ |
314 | block = nlmsvc_lookup_block(file, lock, 0); | 314 | block = nlmsvc_lookup_block(file, lock, 0); |
315 | 315 | ||
316 | lock->fl.fl_flags |= FL_LOCKD; | ||
317 | |||
318 | again: | 316 | again: |
319 | /* Lock file against concurrent access */ | 317 | /* Lock file against concurrent access */ |
320 | down(&file->f_sema); | 318 | 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) | |||
182 | again: | 182 | again: |
183 | file->f_locks = 0; | 183 | file->f_locks = 0; |
184 | for (fl = inode->i_flock; fl; fl = fl->fl_next) { | 184 | for (fl = inode->i_flock; fl; fl = fl->fl_next) { |
185 | if (!(fl->fl_flags & FL_LOCKD)) | 185 | if (fl->fl_lmops != &nlmsvc_lock_operations) |
186 | continue; | 186 | continue; |
187 | 187 | ||
188 | /* update current lock count */ | 188 | /* 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; | |||
667 | #define FL_POSIX 1 | 667 | #define FL_POSIX 1 |
668 | #define FL_FLOCK 2 | 668 | #define FL_FLOCK 2 |
669 | #define FL_ACCESS 8 /* not trying to lock, just looking */ | 669 | #define FL_ACCESS 8 /* not trying to lock, just looking */ |
670 | #define FL_LOCKD 16 /* lock held by rpc.lockd */ | ||
671 | #define FL_LEASE 32 /* lease held on this file */ | 670 | #define FL_LEASE 32 /* lease held on this file */ |
672 | #define FL_SLEEP 128 /* A blocking lock */ | 671 | #define FL_SLEEP 128 /* A blocking lock */ |
673 | 672 | ||