]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge tag 'pull-bcachefs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Jan 2024 02:04:01 +0000 (18:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Jan 2024 02:04:01 +0000 (18:04 -0800)
Pull bcachefs locking fix from Al Viro:
 "Fix broken locking in bch2_ioctl_subvolume_destroy()"

* tag 'pull-bcachefs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  bch2_ioctl_subvolume_destroy(): fix locking
  new helper: user_path_locked_at()

1  2 
fs/bcachefs/fs-ioctl.c
fs/namei.c

Simple merge
diff --cc fs/namei.c
Simple merge