]> git.ipfire.org Git - people/ms/linux.git/commitdiff
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Oct 2020 19:26:05 +0000 (12:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Oct 2020 19:26:05 +0000 (12:26 -0700)
Pull misc vfs updates from Al Viro:
 "Assorted stuff all over the place (the largest group here is
  Christoph's stat cleanups)"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: remove KSTAT_QUERY_FLAGS
  fs: remove vfs_stat_set_lookup_flags
  fs: move vfs_fstatat out of line
  fs: implement vfs_stat and vfs_lstat in terms of vfs_fstatat
  fs: remove vfs_statx_fd
  fs: omfs: use kmemdup() rather than kmalloc+memcpy
  [PATCH] reduce boilerplate in fsid handling
  fs: Remove duplicated flag O_NDELAY occurring twice in VALID_OPEN_FLAGS
  selftests: mount: add nosymfollow tests
  Add a "nosymfollow" mount option.

15 files changed:
1  2 
fs/9p/vfs_super.c
fs/affs/super.c
fs/ceph/super.c
fs/erofs/super.c
fs/exfat/super.c
fs/ext2/super.c
fs/ext4/super.c
fs/f2fs/super.c
fs/namei.c
fs/namespace.c
fs/romfs/super.c
fs/udf/super.c
fs/xfs/xfs_super.c
fs/zonefs/super.c
include/linux/fs.h

Simple merge
diff --cc fs/affs/super.c
Simple merge
diff --cc fs/ceph/super.c
Simple merge
Simple merge
Simple merge
diff --cc fs/ext2/super.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/f2fs/super.c
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/namespace.c
Simple merge
Simple merge
diff --cc fs/udf/super.c
Simple merge
Simple merge
Simple merge
Simple merge