diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/lockd/svclock.c | 2 | ||||
-rw-r--r-- | fs/lockd/svcsubs.c | 2 |
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, | |||
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 */ |