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

Commit 6c310bc1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locks-v4.0-5' of git://git.samba.org/jlayton/linux 

Pull file locking fix from Jeff Layton:
 "Another small fix for the lease overhaul"

* tag 'locks-v4.0-5' of git://git.samba.org/jlayton/linux:
  locks: fix file_lock deletion inside loop
parents 32374ea8 a901125c

fs/locks.c

+2 −3
Original line number Diff line number Diff line
@@ -1388,9 +1388,8 @@ any_leases_conflict(struct inode *inode, struct file_lock *breaker) 
int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)

{

	int error = 0;

	struct file_lock *new_fl;

	struct file_lock_context *ctx = inode->i_flctx;

	struct file_lock *fl;

	struct file_lock *new_fl, *fl, *tmp;

	unsigned long break_time;

	int want_write = (mode & O_ACCMODE) != O_RDONLY;

	LIST_HEAD(dispose);
@@ -1420,7 +1419,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type) 
			break_time++;	/* so that 0 means no break time */

	}



	list_for_each_entry(fl, &ctx->flc_lease, fl_list) {

	list_for_each_entry_safe(fl, tmp, &ctx->flc_lease, fl_list) {

		if (!leases_conflict(fl, new_fl))

			continue;

		if (want_write) {