ovl: change ovl_cleanup_and_whiteout() to take rename lock as needed

Browse source

Rather than locking the directory(s) before calling
ovl_cleanup_and_whiteout(), change it (and ovl_whiteout()) to do the
locking, so the locking can be fine grained as will be needed for
proposed locking changes.

Sometimes this is called to whiteout something in the index dir, in
which case only that dir must be locked.  In one case it is called on
something in an upperdir, so two directories must be locked.  We use
ovl_lock_rename_workdir() for this and remove the restriction that
upperdir cannot be indexdir - because now sometimes it is.

Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: NeilBrown <neil@brown.name>
Link: https://lore.kernel.org/20250716004725.1206467-18-neil@brown.name
Signed-off-by: Christian Brauner <brauner@kernel.org>

...

This commit is contained in:

NeilBrown 2025-07-16 10:44:28 +10:00 • committed by Christian Brauner

parent c69566b1d1

commit 2fa14cf2dc

No known key found for this signature in database

GPG key ID: 91C61BC06578DCA2

3 changed files with 12 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

fs/overlayfs/dir.c

View file

6

fs/overlayfs/readdir.c

View file

12

fs/overlayfs/util.c

View file