diff options
| author |   NeilBrown <neilb@suse.com> | 2016-10-13 15:26:47 +1100 |
|---|---|---|
| committer |   Trond Myklebust <trond.myklebust@primarydata.com> | 2016-12-01 17:57:07 -0500 |
| commit | b184b5c38e4640585126e44ef84f2dbdd0d23d5a (patch) | |
| tree | 25de3c489b02736f94b4625797bd7850bdc3947f /fs/nfs/write.c | |
| parent | NFS: Remove unused argument from nfs_direct_write_complete() (diff) | |
| download | linux-dev-b184b5c38e4640585126e44ef84f2dbdd0d23d5a.tar.xz linux-dev-b184b5c38e4640585126e44ef84f2dbdd0d23d5a.zip | |
NFS: remove l_pid field from nfs_lockowner
this field is not used in any important way and probably should
have been removed by
Commit: 8003d3c4aaa5 ("nfs4: treat lock owners as opaque values")
which removed the pid argument from nfs4_get_lock_state.
Except in unusual and uninteresting cases, two threads with the same
->tgid will have the same ->files pointer, so keeping them both
for comparison brings no benefit.
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/write.c')
| -rw-r--r-- | fs/nfs/write.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 53211838f72a..4d5897e6d6cb 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1151,8 +1151,7 @@ int nfs_flush_incompatible(struct file *file, struct page *page) if (l_ctx && flctx && !(list_empty_careful(&flctx->flc_posix) && list_empty_careful(&flctx->flc_flock))) { - do_flush |= l_ctx->lockowner.l_owner != current->files - || l_ctx->lockowner.l_pid != current->tgid; + do_flush |= l_ctx->lockowner.l_owner != current->files; } nfs_release_request(req); if (!do_flush) |