diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-10-31 00:04:44 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-01-04 16:49:28 -0500 |
| commit | c45821d263a8a5109d69a9e8942b8d65bcd5f31a (patch) | |
| tree | 816e9b7f98f0eb174557dfd093526b165f274348 /fs/locks.c | |
| parent | c84d500bc41658165ceb0dd04dc6a75249940fba (diff) | |
| download | linux-3.10-c45821d263a8a5109d69a9e8942b8d65bcd5f31a.tar.gz linux-3.10-c45821d263a8a5109d69a9e8942b8d65bcd5f31a.tar.bz2 linux-3.10-c45821d263a8a5109d69a9e8942b8d65bcd5f31a.zip | |
locks: eliminate fl_mylease callback
The nfs server only supports read delegations for now, so we don't care
how conflicts are determined. All we care is that unlocks are
recognized as matching the leases they are meant to remove. After the
last patch, a comparison of struct files will work for that purpose. So
we no longer need this callback.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/locks.c b/fs/locks.c index 8729347bcd1..5cb65062281 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -444,15 +444,9 @@ static void lease_release_private_callback(struct file_lock *fl) fl->fl_file->f_owner.signum = 0; } -static int lease_mylease_callback(struct file_lock *fl, struct file_lock *try) -{ - return fl->fl_file == try->fl_file; -} - static const struct lock_manager_operations lease_manager_ops = { .fl_break = lease_break_callback, .fl_release_private = lease_release_private_callback, - .fl_mylease = lease_mylease_callback, .fl_change = lease_modify, }; @@ -1405,7 +1399,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) for (before = &inode->i_flock; ((fl = *before) != NULL) && IS_LEASE(fl); before = &fl->fl_next) { - if (lease->fl_lmops->fl_mylease(fl, lease)) + if (fl->fl_file == lease->fl_file) my_before = before; else if (fl->fl_type == (F_INPROGRESS | F_UNLCK)) /* |