Unverified Commit 392e317a authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

filelock: add lease_dispose_list() helper 



The lease-handling code paths always know they're disposing of leases,
yet locks_dispose_list() checks flags at runtime to determine whether
to call locks_free_lease() or locks_free_lock().

Split out a dedicated lease_dispose_list() helper for lease code paths.
This makes the type handling explicit and prepares for the upcoming
lease_manager enhancements where lease-specific operations are being
consolidated.

Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Link: https://patch.msgid.link/20251204-dir-deleg-ro-v2-1-22d37f92ce2c@kernel.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent ed61378b

fs/locks.c

+19 −10
Original line number Diff line number Diff line
@@ -369,13 +369,22 @@ locks_dispose_list(struct list_head *dispose) 
	while (!list_empty(dispose)) {

		flc = list_first_entry(dispose, struct file_lock_core, flc_list);

		list_del_init(&flc->flc_list);

		if (flc->flc_flags & (FL_LEASE|FL_DELEG|FL_LAYOUT))

			locks_free_lease(file_lease(flc));

		else

		locks_free_lock(file_lock(flc));

	}

}



static void

lease_dispose_list(struct list_head *dispose)

{

	struct file_lock_core *flc;



	while (!list_empty(dispose)) {

		flc = list_first_entry(dispose, struct file_lock_core, flc_list);

		list_del_init(&flc->flc_list);

		locks_free_lease(file_lease(flc));

	}

}



void locks_init_lock(struct file_lock *fl)

{

	memset(fl, 0, sizeof(struct file_lock));
@@ -1620,7 +1629,7 @@ int __break_lease(struct inode *inode, unsigned int flags) 
	spin_unlock(&ctx->flc_lock);

	percpu_up_read(&file_rwsem);



	locks_dispose_list(&dispose);

	lease_dispose_list(&dispose);

	error = wait_event_interruptible_timeout(new_fl->c.flc_wait,

						 list_empty(&new_fl->c.flc_blocked_member),

						 break_time);
@@ -1643,7 +1652,7 @@ int __break_lease(struct inode *inode, unsigned int flags) 
out:

	spin_unlock(&ctx->flc_lock);

	percpu_up_read(&file_rwsem);

	locks_dispose_list(&dispose);

	lease_dispose_list(&dispose);

free_lock:

	locks_free_lease(new_fl);

	return error;
@@ -1727,7 +1736,7 @@ static int __fcntl_getlease(struct file *filp, unsigned int flavor) 
		spin_unlock(&ctx->flc_lock);

		percpu_up_read(&file_rwsem);



		locks_dispose_list(&dispose);

		lease_dispose_list(&dispose);

	}

	return type;

}
@@ -1896,7 +1905,7 @@ generic_add_lease(struct file *filp, int arg, struct file_lease **flp, void **pr 
out:

	spin_unlock(&ctx->flc_lock);

	percpu_up_read(&file_rwsem);

	locks_dispose_list(&dispose);

	lease_dispose_list(&dispose);

	if (is_deleg)

		inode_unlock(inode);

	if (!error && !my_fl)
@@ -1932,7 +1941,7 @@ static int generic_delete_lease(struct file *filp, void *owner) 
		error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose);

	spin_unlock(&ctx->flc_lock);

	percpu_up_read(&file_rwsem);

	locks_dispose_list(&dispose);

	lease_dispose_list(&dispose);

	return error;

}
@@ -2727,7 +2736,7 @@ locks_remove_lease(struct file *filp, struct file_lock_context *ctx) 
	spin_unlock(&ctx->flc_lock);

	percpu_up_read(&file_rwsem);



	locks_dispose_list(&dispose);

	lease_dispose_list(&dispose);

}



/*