diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-11 20:00:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-11 20:00:22 -0800 |
| commit | bf4e7080aeed29354cb156a8eb5d221ab2b6a8cc (patch) | |
| tree | e73826bb1b0b9170a3f410ce622bf62774ecdbf1 /fs/internal.h | |
| parent | Merge tag 'pull-minix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | rename(): avoid a deadlock in the case of parents having no common ancestor (diff) | |
| download | wireguard-linux-bf4e7080aeed29354cb156a8eb5d221ab2b6a8cc.tar.xz wireguard-linux-bf4e7080aeed29354cb156a8eb5d221ab2b6a8cc.zip | |
Merge tag 'pull-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull rename updates from Al Viro:
"Fix directory locking scheme on rename
This was broken in 6.5; we really can't lock two unrelated directories
without holding ->s_vfs_rename_mutex first and in case of same-parent
rename of a subdirectory 6.5 ends up doing just that"
* tag 'pull-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
rename(): avoid a deadlock in the case of parents having no common ancestor
kill lock_two_inodes()
rename(): fix the locking of subdirectories
f2fs: Avoid reading renamed directory if parent does not change
ext4: don't access the source subdirectory content on same-directory rename
ext2: Avoid reading renamed directory if parent does not change
udf_rename(): only access the child content on cross-directory rename
ocfs2: Avoid touching renamed directory if parent does not change
reiserfs: Avoid touching renamed directory if parent does not change
Diffstat (limited to 'fs/internal.h')
| -rw-r--r-- | fs/internal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/internal.h b/fs/internal.h index bf2ee2e0d45d..93cdeeb858cb 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -197,8 +197,6 @@ extern long prune_icache_sb(struct super_block *sb, struct shrink_control *sc); int dentry_needs_remove_privs(struct mnt_idmap *, struct dentry *dentry); bool in_group_or_capable(struct mnt_idmap *idmap, const struct inode *inode, vfsgid_t vfsgid); -void lock_two_inodes(struct inode *inode1, struct inode *inode2, - unsigned subclass1, unsigned subclass2); /* * fs-writeback.c |