Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50f2112c authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Trond Myklebust
Browse files

locks: Set FL_CLOSE when removing flock locks on close() 



Set FL_CLOSE in fl_flags as in locks_remove_posix() when clearing locks.
NFS will check for this flag to ensure an unlock is sent in a following
patch.

Fuse handles flock and posix locks differently for FL_CLOSE, and so
requires a fixup to retain the existing behavior for flock.

Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Acked-by: default avatarMiklos Szeredi <miklos@szeredi.hu>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent e1293727

fs/fuse/file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2168,7 +2168,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock) 
	}

	}





	/* Unlock on close is handled by the flush method */

	/* Unlock on close is handled by the flush method */

	if (fl->fl_flags & FL_CLOSE)

	if ((fl->fl_flags & FL_CLOSE_POSIX) == FL_CLOSE_POSIX)

		return 0;

		return 0;





	fuse_lk_fill(&args, file, fl, opcode, pid, flock, &inarg);

	fuse_lk_fill(&args, file, fl, opcode, pid, flock, &inarg);

fs/locks.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2504,7 +2504,7 @@ locks_remove_flock(struct file *filp, struct file_lock_context *flctx) 
		.fl_owner = filp,

		.fl_owner = filp,

		.fl_pid = current->tgid,

		.fl_pid = current->tgid,

		.fl_file = filp,

		.fl_file = filp,

		.fl_flags = FL_FLOCK,

		.fl_flags = FL_FLOCK | FL_CLOSE,

		.fl_type = F_UNLCK,

		.fl_type = F_UNLCK,

		.fl_end = OFFSET_MAX,

		.fl_end = OFFSET_MAX,

	};

	};

include/linux/fs.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -909,6 +909,8 @@ static inline struct file *get_file(struct file *f) 
#define FL_OFDLCK	1024	/* lock is "owned" by struct file */

#define FL_OFDLCK	1024	/* lock is "owned" by struct file */

#define FL_LAYOUT	2048	/* outstanding pNFS layout */

#define FL_LAYOUT	2048	/* outstanding pNFS layout */





#define FL_CLOSE_POSIX (FL_POSIX | FL_CLOSE)



/*

/*

 * Special return value from posix_lock_file() and vfs_lock_file() for

 * Special return value from posix_lock_file() and vfs_lock_file() for

 * asynchronous locking.

 * asynchronous locking.