On Mon, Apr 28, 2014 at 01:50:13PM -0400, Jeff Layton wrote: > Currently, the fl_owner isn't set for flock locks. Some filesystems use > byte-range locks to simulate flock locks and there is a common idiom in > those that does: > > fl->fl_owner = (fl_owner_t)filp; > fl->fl_start = 0; > fl->fl_end = OFFSET_MAX; > > Since flock locks are generally "owned" by the open file description, > move this into the common flock lock setup code. The fl_start and fl_end > fields are already set appropriately, so remove the unneeded setting of > that in flock ops in those filesystems as well. > > Finally, the lease code also sets the fl_owner as if they were owned by > the process and not the open file description. This is incorrect as > leases have the same ownership semantics as flock locks. Set them the > same way. The lease code doesn't actually use the fl_owner value for > anything, so this is more for consistency's sake than a bugfix. > > Reported-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> > Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxxxxxxx> > --- > drivers/staging/lustre/lustre/llite/file.c | 17 ++++++----------- > fs/9p/vfs_file.c | 3 --- > fs/afs/flock.c | 4 ---- > fs/ceph/locks.c | 10 ++-------- > fs/fuse/file.c | 1 - > fs/locks.c | 4 +++- > fs/nfs/file.c | 4 ---- > 7 files changed, 11 insertions(+), 32 deletions(-) Staging portion: Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
