From 26795ba81fff9765fddd2082c5cabde68025ca8f Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Mon, 20 Mar 2006 13:44:26 -0500 Subject: [PATCH] --- yaml --- r: 23895 b: refs/heads/master c: 7117bf3dfb10b534a017260d9fc643bc1d0afd2a h: refs/heads/master i: 23893: 19fa90b2bdf88ce81453dd6c739be242d0277e53 23891: 12100054e10f4e2b21adf15e7b668522a7e4e322 23887: f1a33dbfe5147d5396ffba1ebe1c2f03a0daeac2 v: v3 --- [refs] | 2 +- trunk/fs/lockd/svclock.c | 2 -- trunk/fs/lockd/svcsubs.c | 2 +- trunk/include/linux/fs.h | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4f9096407a3d..11e3322edda4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dc7c3115b611c00006eac3ee5b108296432aab7 +refs/heads/master: 7117bf3dfb10b534a017260d9fc643bc1d0afd2a diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c index d683dd022e08..d50946dcddd9 100644 --- a/trunk/fs/lockd/svclock.c +++ b/trunk/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/trunk/fs/lockd/svcsubs.c b/trunk/fs/lockd/svcsubs.c index 62f4a385177f..601e5b3dfe20 100644 --- a/trunk/fs/lockd/svcsubs.c +++ b/trunk/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/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 8ef4dd788a83..d2cffee8fc11 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/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 */