* [git pull] vfs.git
@ 2016-05-16 3:32 Al Viro
2016-05-16 15:43 ` Linus Torvalds
0 siblings, 1 reply; 33+ messages in thread
From: Al Viro @ 2016-05-16 3:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
FWIW, I considered sending that pile in several pull requests, but for some
reason git request-pull v4.6 vfs work.lookups spews something very odd into
diffstat - files that have never been touched by it and, in fact, doing
merge with mainline does *not* end up with those files anywhere in the
diff. Full pile doesn't produce any oddities of that sort, so...
Several series here:
* constified struct path * in LSM arguments (me)
* acl and xattr cleanups (some from me, most from Andreas)
* parallel lookups/readdir/atomic_open (me). ->i_mutex replaced with
rwsem, pure lookups take it shared. Exclusion is per-name - no parallel
lookups on the same name in the same parent at the same time. ->atomic_open()
without O_CREAT is also called with parent locked shared. ->iterate() is
being replaced by a new method (->iterate_shared()), which is called with
directory being locked only shared. Most of the filesystems switched to it.
All of them (switched or not) get per-struct file exclusion for readdir
and lseek. Incidentally, do_last()/lookup_open()/atomic_open() got cleaned
up quite a bit.
* preadv2 updates (Christoph)
* rlimit vs coredumping stuff (Omar Sandoval)
* cifs finally getting rid of copying iovecs, manually draining them,
etc. - sock_sendmsg() and sock_recvmsg() allow to simplify things quite a bit
(me).
* assorted cleanups and fixes
If you prefer that stuff to go in separate pulls, please say so. I've no
idea what's triggering the junk in git request-pull for work.lookups -
looks like a merge from -rc1-based branch into -rc3-based one has caused
that somehow (commit 84695ffee). Affected files are the ones changed in
mainline between -rc1 and -rc3 and they *are* identical to their -rc3 state
after that merge commit...
Anyway, sane-looking git request-pull for the whole pile follows:
The following changes since commit 38b78a5f18584db6fa7441e0f4531b283b0e6725:
ovl: ignore permissions on underlying lookup (2016-05-10 23:58:18 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-next
for you to fetch changes up to 16a9fad4ef80ba18d84615eec1a6286b9d71e909:
Merge branch 'sendmsg.cifs' into for-next (2016-05-12 22:31:59 -0400)
----------------------------------------------------------------
Al Viro (113):
[apparmor] constify struct path * in a bunch of helpers
mtd: switch open_mtd_by_chdev() to use of vfs_stat()
mtd: switch ubi_open_volume_path() to vfs_stat()
__d_alloc(): treat NULL name as QSTR("/", 1)
bpf: reject invalid names right in ->lookup()
constify security_path_truncate()
constify vfs_truncate()
apparmor_path_truncate(): path->mnt is never NULL
tomoyo: constify assorted struct path *
constify chown_common/security_path_chown
constify security_sb_mount()
constify chmod_common/security_path_chmod
apparmor: new helper - common_path_perm()
apparmor: constify aa_path_link()
apparmor: constify common_perm_...()
constify security_path_{unlink,rmdir}
constify security_path_{mkdir,mknod,symlink}
apparmor: remove useless checks for NULL ->mnt
constify security_path_{link,rename}
constify security_path_chroot()
constify security_sb_pivotroot()
constify ima_d_path()
reiserfs_cache_default_acl(): use get_acl()
[net] drop 'size' argument of sock_recvmsg()
cifs: merge the hash calculation helpers
cifs: quit playing games with draining iovecs
cifs: no need to wank with copying and advancing iovec on recvmsg side either
cifs_readv_receive: use cifs_read_from_socket()
cifs: don't bother with kmap on read_pages side
ecryptfs: avoid multiple aliases for directories
ecryptfs_lookup(): try either only encrypted or plaintext name
aio: remove a pointless assignment
rw_verify_area(): saner calling conventions
Merge branch 'for-linus' into work.iov_iter
don't bother with ->d_inode->i_sb - it's always equal to ->d_sb
cifs: kill more bogus checks in ->...xattr() methods
reiserfs: switch to generic_{get,set,remove}xattr()
xattr_handler: pass dentry and inode as separate arguments of ->get()
->getxattr(): pass dentry and inode as separate arguments
Merge getxattr prototype change into work.lookups
security_d_instantiate(): move to the point prior to attaching dentry to inode
kernfs: use lookup_one_len_unlocked()
configfs_detach_prep(): make sure that wait_mutex won't go away
ocfs2: don't open-code inode_lock/inode_unlock
orangefs: don't open-code inode_lock/inode_unlock
reiserfs: open-code reiserfs_mutex_lock_safe() in reiserfs_unpack()
reconnect_one(): use lookup_one_len_unlocked()
ovl_lookup_real(): use lookup_one_len_unlocked()
make ext2_get_page() and friends work without external serialization
nfs: missing wakeup in nfs_unblock_sillyrename()
lookup_slow(): bugger off on IS_DEADDIR() from the very beginning
__d_add(): don't drop/regain ->d_lock
beginning of transition to parallel lookups - marking in-lookup dentries
parallel lookups machinery, part 2
parallel lookups machinery, part 3
parallel lookups machinery, part 4 (and last)
parallel lookups: actual switch to rwsem
give readdir(2)/getdents(2)/etc. uniform exclusion with lseek()
introduce a parallel variant of ->iterate()
proc_fill_cache(): switch to d_alloc_parallel()
proc_sys_fill_cache(): switch to d_alloc_parallel()
switch all procfs directories ->iterate_shared()
fuse: switch to ->iterate_shared()
cifs: switch to ->iterate_shared()
dcache_{readdir,dir_lseek}() users: switch to ->iterate_shared
simple local filesystems: switch to ->iterate_shared()
path_openat(): take O_PATH handling out of do_last()
lookup_open(): expand the call of vfs_create()
Merge branch 'for-linus' into work.lookups
atomic_open(): don't bother with EEXIST check - it's done in do_last()
atomic_open(): consolidate "overridden ENOENT" in open-yourself cases
atomic_open(): massage the create_error logics a bit
do_last(): get rid of duplicate ELOOP check
do_last(): take fput() on error after opening to out:
atomic_open(): delay open_to_namei_flags() until the method call
atomic_open(): be paranoid about may_open() return value
lookup_open(): lift the "fallback to !O_CREAT" logics from atomic_open()
atomic_open(): reorder and clean up a bit
lookup_open(): expand the call of real_lookup()
lookup_open(): put the dentry fed to ->lookup() or ->atomic_open() into in-lookup hash
lookup_open(): lock the parent shared unless O_CREAT is given
nfs: switch to ->iterate_shared()
nfs: per-name sillyunlink exclusion
configfs_readdir(): make safe under shared lock
kernfs: no point locking directory around that generic_file_llseek()
lustre: don't need to lock inode in directory lseek
more trivial ->iterate_shared conversions
romfs, squashfs: switch to ->iterate_shared()
fat: switch to ->iterate_shared()
9p: switch to ->iterate_shared()
Merge branch 'for-linus' into work.lookups
switch ecryptfs to ->iterate_shared
logfs: no need to lock directory in lseek
btrfs: switch to ->iterate_shared()
get_acorn_filename(): deobfuscate a bit
isofs: switch to ->iterate_shared()
fold checks into iterate_and_advance()
befs: constify stuff a bit
befs: switch to ->iterate_shared()
afs: switch to ->iterate_shared()
f2fs: switch to ->iterate_shared()
gfs2: switch to ->iterate_shared()
hpfs: handle allocation failures in hpfs_add_pos()
hpfs: switch to ->iterate_shared()
hostfs: switch to ->iterate_shared()
hfsplus: switch to ->iterate_shared()
hfs: switch to ->iterate_shared()
ext4: switch to ->iterate_shared()
gfs2: Switch to generic xattr handlers
Merge branch 'for-cifs' into work.xattr
Merge branches 'work.xattr', 'work.preadv2', 'work.iov_iter', 'work.const-path' and 'work.misc' into for-next
Merge branch 'ovl-fixes' into for-next
Merge branch 'sendmsg.cifs' into for-next
Andreas Gruenbacher (13):
jfs: Remove unnecessary code in jfs_get_acl
posix_acl: Inode acl caching fixes
posix_acl: Unexport acl_by_type and make it static
cifs: Fix xattr name checks
cifs: Check for equality with ACL_TYPE_ACCESS and ACL_TYPE_DEFAULT
cifs: Fix removexattr for os2.* xattrs
cifs: Switch to generic xattr handlers
ceph: Get rid of d_find_alias in ceph_set_acl
ceph: Switch to generic xattr handlers
jfs: Clean up xattr name mapping
jfs: Switch to generic xattr handlers
ubifs: Switch to generic xattr handlers
btrfs: Switch to generic xattr handlers
Christoph Hellwig (10):
filemap: remove pos variables in generic_file_read_iter
filemap: remove the pos argument to generic_file_direct_write
xfs: eliminate the pos variable in xfs_file_dio_aio_write
direct-io: eliminate the offset argument to ->direct_IO
direct-io: remove the offset argument to dio_complete
fs: add IOCB_SYNC and IOCB_DSYNC
fs: simplify the generic_write_sync prototype
ceph: use generic_write_sync
fs: add RWF_DSYNC aand RWF_SYNC
nfsd: use RWF_SYNC
Omar Sandoval (2):
coredump: get rid of coredump_params->written
coredump: only charge written data against RLIMIT_CORE
Yan, Zheng (1):
ceph: kill __ceph_removexattr()
Documentation/filesystems/Locking | 2 +-
Documentation/filesystems/porting | 53 +++
Documentation/filesystems/vfs.txt | 2 +-
arch/alpha/kernel/osf_sys.c | 4 +-
arch/powerpc/platforms/cell/spufs/coredump.c | 5 +-
arch/powerpc/platforms/cell/spufs/inode.c | 2 +-
block/blk-map.c | 47 +--
drivers/mtd/ubi/build.c | 13 +-
drivers/mtd/ubi/kapi.c | 19 +-
drivers/staging/lustre/lustre/llite/dir.c | 4 +-
.../staging/lustre/lustre/llite/llite_internal.h | 4 +-
drivers/staging/lustre/lustre/llite/rw26.c | 4 +-
drivers/staging/lustre/lustre/llite/xattr.c | 6 +-
drivers/target/iscsi/iscsi_target_util.c | 5 +-
fs/9p/acl.c | 8 +-
fs/9p/vfs_addr.c | 3 +-
fs/9p/vfs_dir.c | 4 +-
fs/9p/vfs_inode.c | 2 +-
fs/9p/xattr.c | 4 +-
fs/affs/dir.c | 2 +-
fs/affs/file.c | 5 +-
fs/afs/dir.c | 16 +-
fs/aio.c | 2 -
fs/autofs4/root.c | 4 +-
fs/bad_inode.c | 4 +-
fs/befs/befs.h | 4 +-
fs/befs/btree.c | 16 +-
fs/befs/btree.h | 4 +-
fs/befs/datastream.c | 26 +-
fs/befs/datastream.h | 11 +-
fs/befs/linuxvfs.c | 6 +-
fs/bfs/dir.c | 2 +-
fs/binfmt_elf.c | 2 +-
fs/binfmt_elf_fdpic.c | 2 +-
fs/block_dev.c | 14 +-
fs/btrfs/acl.c | 3 -
fs/btrfs/file.c | 16 +-
fs/btrfs/inode.c | 24 +-
fs/btrfs/ioctl.c | 18 +-
fs/btrfs/tree-log.c | 6 +-
fs/btrfs/xattr.c | 28 +-
fs/btrfs/xattr.h | 3 -
fs/ceph/acl.c | 16 +-
fs/ceph/addr.c | 3 +-
fs/ceph/dir.c | 7 +-
fs/ceph/file.c | 11 +-
fs/ceph/inode.c | 29 +-
fs/ceph/super.h | 8 +-
fs/ceph/xattr.c | 192 ++--------
fs/cifs/Makefile | 3 +-
fs/cifs/cifs_dfs_ref.c | 2 +-
fs/cifs/cifsencrypt.c | 97 ++---
fs/cifs/cifsfs.c | 28 +-
fs/cifs/cifsfs.h | 12 +-
fs/cifs/cifsglob.h | 2 -
fs/cifs/cifsproto.h | 12 +-
fs/cifs/cifssmb.c | 15 +-
fs/cifs/connect.c | 127 ++-----
fs/cifs/file.c | 62 +---
fs/cifs/inode.c | 3 +-
fs/cifs/readdir.c | 57 +--
fs/cifs/smb2transport.c | 107 +-----
fs/cifs/transport.c | 141 +++-----
fs/cifs/xattr.c | 386 ++++++++------------
fs/coda/dir.c | 18 +-
fs/compat.c | 12 +-
fs/configfs/dir.c | 37 +-
fs/configfs/inode.c | 2 +-
fs/coredump.c | 5 +-
fs/cramfs/inode.c | 2 +-
fs/dax.c | 4 +-
fs/dcache.c | 280 ++++++++++++--
fs/direct-io.c | 34 +-
fs/ecryptfs/crypto.c | 5 +-
fs/ecryptfs/ecryptfs_kernel.h | 4 +-
fs/ecryptfs/file.c | 73 +++-
fs/ecryptfs/inode.c | 108 +++---
fs/ecryptfs/mmap.c | 3 +-
fs/efs/dir.c | 3 +-
fs/efs/namei.c | 2 +-
fs/exofs/dir.c | 16 +-
fs/exofs/inode.c | 3 +-
fs/exofs/super.c | 2 +-
fs/exportfs/expfs.c | 12 +-
fs/ext2/acl.c | 3 -
fs/ext2/dir.c | 16 +-
fs/ext2/inode.c | 8 +-
fs/ext2/namei.c | 2 +-
fs/ext2/xattr_security.c | 6 +-
fs/ext2/xattr_trusted.c | 6 +-
fs/ext2/xattr_user.c | 8 +-
fs/ext4/acl.c | 3 -
fs/ext4/dir.c | 4 +-
fs/ext4/ext4.h | 3 +-
fs/ext4/file.c | 9 +-
fs/ext4/indirect.c | 12 +-
fs/ext4/inode.c | 18 +-
fs/ext4/namei.c | 4 +-
fs/ext4/xattr_security.c | 6 +-
fs/ext4/xattr_trusted.c | 6 +-
fs/ext4/xattr_user.c | 8 +-
fs/f2fs/acl.c | 3 -
fs/f2fs/data.c | 6 +-
fs/f2fs/dir.c | 2 +-
fs/f2fs/file.c | 9 +-
fs/f2fs/namei.c | 2 +-
fs/f2fs/xattr.c | 14 +-
fs/fat/dir.c | 6 +-
fs/fat/inode.c | 6 +-
fs/file.c | 5 +
fs/freevxfs/vxfs_lookup.c | 2 +-
fs/fuse/dir.c | 99 +++--
fs/fuse/file.c | 5 +-
fs/gfs2/acl.c | 58 ++-
fs/gfs2/acl.h | 1 +
fs/gfs2/aops.c | 6 +-
fs/gfs2/file.c | 9 +-
fs/gfs2/inode.c | 83 +----
fs/gfs2/ops_fstype.c | 4 +-
fs/gfs2/super.c | 2 +-
fs/gfs2/xattr.c | 48 ++-
fs/hfs/attr.c | 5 +-
fs/hfs/catalog.c | 3 +
fs/hfs/dir.c | 12 +-
fs/hfs/hfs_fs.h | 5 +-
fs/hfs/inode.c | 9 +-
fs/hfsplus/catalog.c | 3 +
fs/hfsplus/dir.c | 12 +-
fs/hfsplus/hfsplus_fs.h | 1 +
fs/hfsplus/inode.c | 8 +-
fs/hfsplus/posix_acl.c | 3 -
fs/hfsplus/super.c | 1 +
fs/hfsplus/xattr.c | 10 +-
fs/hfsplus/xattr.h | 2 +-
fs/hfsplus/xattr_security.c | 6 +-
fs/hfsplus/xattr_trusted.c | 6 +-
fs/hfsplus/xattr_user.c | 6 +-
fs/hostfs/hostfs_kern.c | 2 +-
fs/hpfs/dir.c | 12 +-
fs/hpfs/dnode.c | 8 +-
fs/hpfs/hpfs_fn.h | 2 +-
fs/inode.c | 17 +-
fs/isofs/dir.c | 4 +-
fs/isofs/rock.c | 13 +-
fs/jffs2/acl.c | 2 -
fs/jffs2/dir.c | 4 +-
fs/jffs2/security.c | 6 +-
fs/jffs2/super.c | 2 +-
fs/jffs2/xattr_trusted.c | 6 +-
fs/jffs2/xattr_user.c | 6 +-
fs/jfs/acl.c | 6 -
fs/jfs/file.c | 6 +-
fs/jfs/inode.c | 7 +-
fs/jfs/jfs_xattr.h | 6 +-
fs/jfs/namei.c | 8 +-
fs/jfs/symlink.c | 12 +-
fs/jfs/xattr.c | 224 +++++-------
fs/kernfs/dir.c | 17 +-
fs/kernfs/inode.c | 6 +-
fs/kernfs/kernfs-internal.h | 4 +-
fs/kernfs/mount.c | 5 +-
fs/libfs.c | 11 +-
fs/logfs/dir.c | 4 +-
fs/minix/dir.c | 2 +-
fs/namei.c | 401 ++++++++++-----------
fs/nfs/dir.c | 80 ++--
fs/nfs/direct.c | 23 +-
fs/nfs/file.c | 2 +-
fs/nfs/inode.c | 4 +-
fs/nfs/nfs3acl.c | 43 ++-
fs/nfs/nfs4proc.c | 14 +-
fs/nfs/nfstrace.h | 2 +-
fs/nfs/unlink.c | 192 +++-------
fs/nfsd/nfs3proc.c | 4 +-
fs/nfsd/nfs3xdr.c | 2 +-
fs/nfsd/nfsfh.c | 2 +-
fs/nfsd/vfs.c | 18 +-
fs/nilfs2/dir.c | 16 +-
fs/nilfs2/inode.c | 4 +-
fs/nilfs2/namei.c | 2 +-
fs/ntfs/file.c | 7 +-
fs/ocfs2/aops.c | 13 +-
fs/ocfs2/dlmglue.c | 3 +
fs/ocfs2/file.c | 2 +-
fs/ocfs2/inode.c | 2 +-
fs/ocfs2/xattr.c | 20 +-
fs/omfs/dir.c | 2 +-
fs/open.c | 8 +-
fs/openpromfs/inode.c | 2 +-
fs/orangefs/file.c | 4 +-
fs/orangefs/orangefs-kernel.h | 4 +-
fs/orangefs/xattr.c | 10 +-
fs/overlayfs/inode.c | 4 +-
fs/overlayfs/overlayfs.h | 4 +-
fs/overlayfs/readdir.c | 4 +-
fs/overlayfs/super.c | 2 +-
fs/posix_acl.c | 116 +++---
fs/proc/base.c | 35 +-
fs/proc/fd.c | 8 +-
fs/proc/generic.c | 2 +-
fs/proc/namespaces.c | 3 +-
fs/proc/proc_net.c | 2 +-
fs/proc/proc_sysctl.c | 17 +-
fs/proc/root.c | 4 +-
fs/qnx4/dir.c | 2 +-
fs/qnx6/dir.c | 2 +-
fs/read_write.c | 51 +--
fs/readdir.c | 37 +-
fs/reiserfs/dir.c | 2 +-
fs/reiserfs/file.c | 6 +-
fs/reiserfs/inode.c | 7 +-
fs/reiserfs/ioctl.c | 6 +-
fs/reiserfs/namei.c | 18 +-
fs/reiserfs/xattr.c | 54 ---
fs/reiserfs/xattr.h | 9 +-
fs/reiserfs/xattr_acl.c | 8 +-
fs/reiserfs/xattr_security.c | 19 +-
fs/reiserfs/xattr_trusted.c | 19 +-
fs/reiserfs/xattr_user.c | 19 +-
fs/romfs/super.c | 4 +-
fs/splice.c | 3 +
fs/squashfs/dir.c | 4 +-
fs/squashfs/xattr.c | 6 +-
fs/sysv/dir.c | 2 +-
fs/ubifs/dir.c | 8 +-
fs/ubifs/file.c | 12 +-
fs/ubifs/super.c | 1 +
fs/ubifs/ubifs.h | 7 +-
fs/ubifs/xattr.c | 145 ++++----
fs/udf/dir.c | 2 +-
fs/udf/file.c | 7 +-
fs/udf/inode.c | 7 +-
fs/udf/namei.c | 2 +-
fs/ufs/dir.c | 16 +-
fs/ufs/super.c | 2 +-
fs/xattr.c | 12 +-
fs/xfs/xfs_acl.c | 20 +-
fs/xfs/xfs_aops.c | 7 +-
fs/xfs/xfs_file.c | 25 +-
fs/xfs/xfs_xattr.c | 6 +-
include/linux/dax.h | 2 +-
include/linux/dcache.h | 26 +-
include/linux/file.h | 13 +
include/linux/fs.h | 94 ++++-
include/linux/lsm_hooks.h | 28 +-
include/linux/net.h | 3 +-
include/linux/nfs_fs.h | 16 +-
include/linux/nfs_xdr.h | 4 +-
include/linux/posix_acl.h | 1 -
include/linux/security.h | 58 +--
include/linux/uio.h | 1 +
include/linux/xattr.h | 5 +-
include/trace/events/ext4.h | 6 +-
include/uapi/linux/fs.h | 2 +
kernel/audit_watch.c | 2 +-
kernel/bpf/inode.c | 37 +-
lib/iov_iter.c | 123 +++----
mm/filemap.c | 30 +-
mm/page_io.c | 2 +-
mm/shmem.c | 9 +-
net/socket.c | 25 +-
net/unix/af_unix.c | 2 +-
security/apparmor/file.c | 4 +-
security/apparmor/include/file.h | 4 +-
security/apparmor/include/path.h | 2 +-
security/apparmor/lsm.c | 83 ++---
security/apparmor/path.c | 8 +-
security/commoncap.c | 6 +-
security/integrity/evm/evm_main.c | 6 +-
security/integrity/ima/ima.h | 2 +-
security/integrity/ima/ima_api.c | 2 +-
security/security.c | 28 +-
security/selinux/hooks.c | 13 +-
security/smack/smack_lsm.c | 6 +-
security/tomoyo/common.h | 12 +-
security/tomoyo/file.c | 10 +-
security/tomoyo/mount.c | 4 +-
security/tomoyo/tomoyo.c | 28 +-
278 files changed, 2654 insertions(+), 3037 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2016-05-16 3:32 [git pull] vfs.git Al Viro
@ 2016-05-16 15:43 ` Linus Torvalds
2016-05-17 6:27 ` Al Viro
0 siblings, 1 reply; 33+ messages in thread
From: Linus Torvalds @ 2016-05-16 15:43 UTC (permalink / raw)
To: Al Viro; +Cc: Linux Kernel Mailing List, linux-fsdevel
On Sun, May 15, 2016 at 8:32 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> FWIW, I considered sending that pile in several pull requests, but for some
> reason git request-pull v4.6 vfs work.lookups spews something very odd into
> diffstat - files that have never been touched by it and, in fact, doing
> merge with mainline does *not* end up with those files anywhere in the
> diff.
This is "normal" if you have multiple merge bases (which in turn
happens various ways, but all of them involved the branch having
merges in itself, either back-merges or just merging two or more topic
branches that had different starting points).
What happens is that request-pull will just pick the first merge base
and then do a diff against that - which can happen to work, but most
of the time you'll get part of the diff being from the differences
that happened betweeen the different merge bases, rather than just the
code that is in "your" branch.
The only way to get a reliably correct diff is to actually do the
merge (which is a much more complex operation when there are multiple
merge bases - git will actually do intermediate merges between the
merge bases and then do a merge based on that - it's why the default
git merge is called a "recursive" merge).
Some maintainers actually do that merge (into a private branch) to get
that reliable end result and also to get a heads-up about any merge
conflicts I would see when pulling. But I don't actually require it,
it's ok if the pull request ends up looking messy due to just using
the plain request-pull machinery without any merging.
The shortlog is always reliable, because that is not a "diff"
operation (which is inherently about two end-points - and with
multiple merge bases there are more than two end-points so "diff" is
inevitably too weak an operation to show the differences). The
shortlog is about the set of commits, and git will do the proper set
operation to see "commits in A but not in B". So if you get surprising
results in the shortlog, then that means that something is actually
wrong in your tree and you should look out.
> Full pile doesn't produce any oddities of that sort, so...
The fact that the full pile doesn't is likely just because the merges
you added, which brought in a new merge base and it may now be unique
(because you merged with my tree as you did them) or it just happens
to be one of the merge points that works by luck for "diff".
> If you prefer that stuff to go in separate pulls, please say so.
This time I'd really prefer it, especially that parallel lookup
branch. That's such a big fundamental change that it definitely merits
being merged separately rather than as part of "here's all the vfs
changes for 4.7"..
As mentioned, you *can* get the diff right by testing a pre-merge, but
you don't need to, and I'll take the messy diff.
Even when it doesn't match the diff after-the-merge, I can trivially
verify _why_ the pull-request diff differs. That happens not just
because of the multiple merge-bases issue, but you get differences
with merge diffs in other cases too (ie any case where merging had to
do any non-trivial merging action - perhaps due to part of a patch
already being applied in my tree for other reasons etc etc).
Linus
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2016-05-16 15:43 ` Linus Torvalds
@ 2016-05-17 6:27 ` Al Viro
2016-05-17 18:27 ` Linus Torvalds
0 siblings, 1 reply; 33+ messages in thread
From: Al Viro @ 2016-05-17 6:27 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Kernel Mailing List, linux-fsdevel
On Mon, May 16, 2016 at 08:43:33AM -0700, Linus Torvalds wrote:
> On Sun, May 15, 2016 at 8:32 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> > FWIW, I considered sending that pile in several pull requests, but for some
> > reason git request-pull v4.6 vfs work.lookups spews something very odd into
> > diffstat - files that have never been touched by it and, in fact, doing
> > merge with mainline does *not* end up with those files anywhere in the
> > diff.
>
> This is "normal" if you have multiple merge bases (which in turn
> happens various ways, but all of them involved the branch having
> merges in itself, either back-merges or just merging two or more topic
> branches that had different starting points).
OK... What happened is that I started these branches off -rc1, then by -rc3
realized that PAGE_CACHE_SIZE->PAGE_SIZE stuff was going to create one hell
of merge noise and rebased work.lookups to it. I would've done the same to
work.xattr, but by then I had a never-rebase branch on top of it (cifs
xattr stuff) and that meant that work.xattr (including its initial segment
needed in work.lookups) was stuck at -rc1. Oh, well...
> > If you prefer that stuff to go in separate pulls, please say so.
>
> This time I'd really prefer it, especially that parallel lookup
> branch. That's such a big fundamental change that it definitely merits
> being merged separately rather than as part of "here's all the vfs
> changes for 4.7"..
OK. What I've got looks so:
#work.const-path - rc1-based, no conflicts with anything, independent from
everything else
#work.misc - ditto
#work.iov_iter - ditto, but with merge from #for-linus at some point.
No conflicts either (and that #for-linus had also been rc1-based).
#work.preadv2 - rc3-based, no conflicts with anything, independent from
everything else
#sendmsg.cifs - rc1-based, trims quite a bit of now-unneeded crap from cifs.
One obvious conflict with PAGE_CACHE_SIZE->PAGE_SIZE in there. Independent
from everything else.
#work.xattr - rc1-based, some starts with some acl fixes, then switches
->getxattr to passing inode and dentry separately. This is the point
where the things start to get tricky - that got merged into the very
beginning of the -rc3-based #work.lookups, to allow untangling the
security_d_instantiate() mess. That merge actually got one of the
PAGE_CACHE_SIZE conflicts resolved. #work.xattr itself proceeds to switch
a lot of filesystems to generic_...xattr(); no complications there.
#work.lookups, after that initial merge from #work.xattr does the following:
* untangle security_d_instantiate()
* convert a bunch of open-coded lookup_one_len_unlocked() to calls
of that thing; one such place (in overlayfs) actually yields a trivial
conflict with overlayfs fixes later in the cycle - overlayfs ended up
switching to a variant of lookup_one_len_unlocked() sans the permission
checks. I would've dropped that commit (it gets overridden on merge from
#ovl-fixes in #for-next; proper resolution is to use the variant in mainline
fs/overlayfs/super.c), but I didn't want to rebase the damn thing - it was
fairly late in the cycle...
* some filesystems had managed to depend on lookup/lookup exclusion
for *fs-internal* data structures in a way that would break if we relaxed the
VFS exclusion. Fixing hadn't been hard, fortunately.
* core of that series - parallel lookup machinery, replacing ->i_mutex
with rwsem, making lookup_slow() take it only shared. At that point lookups
happen in parallel; lookups on the same name wait for the in-progress one
to be done with that dentry. Surprisingly little code, at that - almost all
of it is in fs/dcache.c, with fs/namei.c changes limited to lookup_slow() -
making it use the new primitive and actually switching to locking shared.
* parallel readdir stuff - first of all, we provide the exclusion
on per-struct file basis, same as we do for read() vs. lseek() for regular
files. That takes care of most of the needed exclusion in readdir/readdir;
however, these guys are trickier than lookups, so I went for switching them
one-by-one - new method (->iterate_shared()) is added and filesystems are
switched to it as they are either confirmed to be OK with shared lock on
directory or fixed to be OK with that. I hope to kill the original method
come next cycle (almost all in-tree filesystems are switched already), but
it's still not quite finished.
* several filesystems get switched to parallel readdir. The
interesting part here is dealing with dcache preseeding by readdir; that
needs minor adjustment to be safe with directory locked only shared.
Most of the filesystems doing that got switched to in those commits.
Important exception: NFS. Turns out that NFS folks, with their, er,
insistence on VFS getting the fuck out of the way of the Smart Filesystem
Code That Knows How And What To Lock(tm) have grown the locking of their
own. Homegrown rwsem, with lookup/readdir/atomic_open being *writers*
(sillyunlink is the reader there). Of course, with VFS getting the fuck
out of the way, as requested, the actual smarts of the smart filesystem
code etc. had become exposed...
* do_last/lookup_open/atomic_open cleanups. As the result,
open() without O_CREAT locks the directory only shared. Including the
->atomic_open() case. Backmerge from #for-linus in the middle of that -
atomic_open() fix got brought in.
* then comes NFS switch to saner (VFS-based ;-) locking, killing
the homegrown "lookup and readdir are writers" kinda-sorta rwsem. All
exclusion for sillyunlink/lookup is done by the parallel lookups mechanism.
Exclusion between sillyunlink and rmdir is a real rwsem now - rmdir being
the writer. Result: NFS lookups/readdirs/O_CREAT-less opens happen in parallel
now.
* the rest of the series consists of switching a lot of filesystems
to parallel readdir; in a lot of cases ->llseek() gets simplified as well.
One backmerge in there (again, #for-linus - rockridge fix).
That's it for #work.lookups. There's one conflict in that pile (overlayfs
one mentioned above) and there's a conflict resolved in the first merge
(rc3 vs. beginning of #work.xattr).
FWIW, I think the least PITA would be if I send #work.lookups + backmerge from
#ovl-fixes to resolve the fs/overlay/super.c conflict. If you think that
it needs to done in even smaller steps (after all, it's about 3/4 of the
entire pile), please say so. Otherwise, see below:
The following changes since commit 38b78a5f18584db6fa7441e0f4531b283b0e6725:
ovl: ignore permissions on underlying lookup (2016-05-10 23:58:18 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
for you to fetch changes up to 0e0162bb8c008fa7742f69d4d4982c8a37b88f95:
Merge branch 'ovl-fixes' into for-linus (2016-05-17 02:17:59 -0400)
----------------------------------------------------------------
Al Viro (75):
reiserfs_cache_default_acl(): use get_acl()
don't bother with ->d_inode->i_sb - it's always equal to ->d_sb
cifs: kill more bogus checks in ->...xattr() methods
reiserfs: switch to generic_{get,set,remove}xattr()
xattr_handler: pass dentry and inode as separate arguments of ->get()
->getxattr(): pass dentry and inode as separate arguments
Merge getxattr prototype change into work.lookups
security_d_instantiate(): move to the point prior to attaching dentry to inode
kernfs: use lookup_one_len_unlocked()
configfs_detach_prep(): make sure that wait_mutex won't go away
ocfs2: don't open-code inode_lock/inode_unlock
orangefs: don't open-code inode_lock/inode_unlock
reiserfs: open-code reiserfs_mutex_lock_safe() in reiserfs_unpack()
reconnect_one(): use lookup_one_len_unlocked()
ovl_lookup_real(): use lookup_one_len_unlocked()
make ext2_get_page() and friends work without external serialization
nfs: missing wakeup in nfs_unblock_sillyrename()
lookup_slow(): bugger off on IS_DEADDIR() from the very beginning
__d_add(): don't drop/regain ->d_lock
beginning of transition to parallel lookups - marking in-lookup dentries
parallel lookups machinery, part 2
parallel lookups machinery, part 3
parallel lookups machinery, part 4 (and last)
parallel lookups: actual switch to rwsem
give readdir(2)/getdents(2)/etc. uniform exclusion with lseek()
introduce a parallel variant of ->iterate()
proc_fill_cache(): switch to d_alloc_parallel()
proc_sys_fill_cache(): switch to d_alloc_parallel()
switch all procfs directories ->iterate_shared()
fuse: switch to ->iterate_shared()
cifs: switch to ->iterate_shared()
dcache_{readdir,dir_lseek}() users: switch to ->iterate_shared
simple local filesystems: switch to ->iterate_shared()
path_openat(): take O_PATH handling out of do_last()
lookup_open(): expand the call of vfs_create()
Merge branch 'for-linus' into work.lookups
atomic_open(): don't bother with EEXIST check - it's done in do_last()
atomic_open(): consolidate "overridden ENOENT" in open-yourself cases
atomic_open(): massage the create_error logics a bit
do_last(): get rid of duplicate ELOOP check
do_last(): take fput() on error after opening to out:
atomic_open(): delay open_to_namei_flags() until the method call
atomic_open(): be paranoid about may_open() return value
lookup_open(): lift the "fallback to !O_CREAT" logics from atomic_open()
atomic_open(): reorder and clean up a bit
lookup_open(): expand the call of real_lookup()
lookup_open(): put the dentry fed to ->lookup() or ->atomic_open() into in-lookup hash
lookup_open(): lock the parent shared unless O_CREAT is given
nfs: switch to ->iterate_shared()
nfs: per-name sillyunlink exclusion
configfs_readdir(): make safe under shared lock
kernfs: no point locking directory around that generic_file_llseek()
lustre: don't need to lock inode in directory lseek
more trivial ->iterate_shared conversions
romfs, squashfs: switch to ->iterate_shared()
fat: switch to ->iterate_shared()
9p: switch to ->iterate_shared()
Merge branch 'for-linus' into work.lookups
switch ecryptfs to ->iterate_shared
logfs: no need to lock directory in lseek
btrfs: switch to ->iterate_shared()
get_acorn_filename(): deobfuscate a bit
isofs: switch to ->iterate_shared()
befs: constify stuff a bit
befs: switch to ->iterate_shared()
afs: switch to ->iterate_shared()
f2fs: switch to ->iterate_shared()
gfs2: switch to ->iterate_shared()
hpfs: handle allocation failures in hpfs_add_pos()
hpfs: switch to ->iterate_shared()
hostfs: switch to ->iterate_shared()
hfsplus: switch to ->iterate_shared()
hfs: switch to ->iterate_shared()
ext4: switch to ->iterate_shared()
Merge branch 'ovl-fixes' into for-linus
Andreas Gruenbacher (3):
jfs: Remove unnecessary code in jfs_get_acl
posix_acl: Inode acl caching fixes
posix_acl: Unexport acl_by_type and make it static
Documentation/filesystems/porting | 53 +++
arch/alpha/kernel/osf_sys.c | 4 +-
arch/powerpc/platforms/cell/spufs/inode.c | 2 +-
block/blk-map.c | 47 +--
drivers/staging/lustre/lustre/llite/dir.c | 4 +-
.../staging/lustre/lustre/llite/llite_internal.h | 4 +-
drivers/staging/lustre/lustre/llite/xattr.c | 6 +-
fs/9p/acl.c | 8 +-
fs/9p/vfs_dir.c | 4 +-
fs/9p/vfs_inode.c | 2 +-
fs/9p/xattr.c | 4 +-
fs/affs/dir.c | 2 +-
fs/afs/dir.c | 16 +-
fs/autofs4/root.c | 4 +-
fs/bad_inode.c | 4 +-
fs/befs/befs.h | 4 +-
fs/befs/btree.c | 16 +-
fs/befs/btree.h | 4 +-
fs/befs/datastream.c | 26 +-
fs/befs/datastream.h | 11 +-
fs/befs/linuxvfs.c | 6 +-
fs/bfs/dir.c | 2 +-
fs/btrfs/acl.c | 3 -
fs/btrfs/inode.c | 2 +-
fs/btrfs/ioctl.c | 18 +-
fs/btrfs/tree-log.c | 6 +-
fs/btrfs/xattr.c | 6 +-
fs/ceph/acl.c | 2 +
fs/ceph/super.h | 2 +-
fs/ceph/xattr.c | 8 +-
fs/cifs/cifs_dfs_ref.c | 2 +-
fs/cifs/cifsfs.c | 2 +-
fs/cifs/cifsfs.h | 2 +-
fs/cifs/inode.c | 3 +-
fs/cifs/readdir.c | 57 +--
fs/cifs/xattr.c | 56 +--
fs/coda/dir.c | 18 +-
fs/compat.c | 12 +-
fs/configfs/dir.c | 37 +-
fs/configfs/inode.c | 2 +-
fs/cramfs/inode.c | 2 +-
fs/dcache.c | 267 ++++++++++++--
fs/ecryptfs/crypto.c | 5 +-
fs/ecryptfs/ecryptfs_kernel.h | 4 +-
fs/ecryptfs/file.c | 73 +++-
fs/ecryptfs/inode.c | 23 +-
fs/ecryptfs/mmap.c | 3 +-
fs/efs/dir.c | 3 +-
fs/efs/namei.c | 2 +-
fs/exofs/dir.c | 16 +-
fs/exofs/super.c | 2 +-
fs/exportfs/expfs.c | 12 +-
fs/ext2/acl.c | 3 -
fs/ext2/dir.c | 16 +-
fs/ext2/namei.c | 2 +-
fs/ext2/xattr_security.c | 6 +-
fs/ext2/xattr_trusted.c | 6 +-
fs/ext2/xattr_user.c | 8 +-
fs/ext4/acl.c | 3 -
fs/ext4/dir.c | 4 +-
fs/ext4/namei.c | 4 +-
fs/ext4/xattr_security.c | 6 +-
fs/ext4/xattr_trusted.c | 6 +-
fs/ext4/xattr_user.c | 8 +-
fs/f2fs/acl.c | 3 -
fs/f2fs/dir.c | 2 +-
fs/f2fs/namei.c | 2 +-
fs/f2fs/xattr.c | 14 +-
fs/fat/dir.c | 6 +-
fs/file.c | 5 +
fs/freevxfs/vxfs_lookup.c | 2 +-
fs/fuse/dir.c | 99 +++--
fs/gfs2/file.c | 4 +-
fs/gfs2/inode.c | 9 +-
fs/gfs2/ops_fstype.c | 4 +-
fs/gfs2/super.c | 2 +-
fs/gfs2/xattr.c | 6 +-
fs/hfs/attr.c | 5 +-
fs/hfs/catalog.c | 3 +
fs/hfs/dir.c | 12 +-
fs/hfs/hfs_fs.h | 5 +-
fs/hfs/inode.c | 2 +
fs/hfsplus/catalog.c | 3 +
fs/hfsplus/dir.c | 12 +-
fs/hfsplus/hfsplus_fs.h | 1 +
fs/hfsplus/inode.c | 1 +
fs/hfsplus/posix_acl.c | 3 -
fs/hfsplus/super.c | 1 +
fs/hfsplus/xattr.c | 10 +-
fs/hfsplus/xattr.h | 2 +-
fs/hfsplus/xattr_security.c | 6 +-
fs/hfsplus/xattr_trusted.c | 6 +-
fs/hfsplus/xattr_user.c | 6 +-
fs/hostfs/hostfs_kern.c | 2 +-
fs/hpfs/dir.c | 12 +-
fs/hpfs/dnode.c | 8 +-
fs/hpfs/hpfs_fn.h | 2 +-
fs/inode.c | 17 +-
fs/isofs/dir.c | 4 +-
fs/isofs/rock.c | 13 +-
fs/jffs2/acl.c | 2 -
fs/jffs2/dir.c | 4 +-
fs/jffs2/security.c | 6 +-
fs/jffs2/super.c | 2 +-
fs/jffs2/xattr_trusted.c | 6 +-
fs/jffs2/xattr_user.c | 6 +-
fs/jfs/acl.c | 6 -
fs/jfs/jfs_xattr.h | 2 +-
fs/jfs/namei.c | 2 +-
fs/jfs/xattr.c | 8 +-
fs/kernfs/dir.c | 17 +-
fs/kernfs/inode.c | 6 +-
fs/kernfs/kernfs-internal.h | 4 +-
fs/kernfs/mount.c | 5 +-
fs/libfs.c | 11 +-
fs/logfs/dir.c | 4 +-
fs/minix/dir.c | 2 +-
fs/namei.c | 399 ++++++++++-----------
fs/nfs/dir.c | 80 +++--
fs/nfs/direct.c | 2 +-
fs/nfs/inode.c | 4 +-
fs/nfs/nfs3acl.c | 43 ++-
fs/nfs/nfs4proc.c | 14 +-
fs/nfs/nfstrace.h | 2 +-
fs/nfs/unlink.c | 192 +++-------
fs/nfsd/nfs3proc.c | 4 +-
fs/nfsd/nfs3xdr.c | 2 +-
fs/nfsd/nfsfh.c | 2 +-
fs/nilfs2/dir.c | 16 +-
fs/nilfs2/namei.c | 2 +-
fs/ocfs2/aops.c | 4 +-
fs/ocfs2/dlmglue.c | 3 +
fs/ocfs2/file.c | 2 +-
fs/ocfs2/inode.c | 2 +-
fs/ocfs2/xattr.c | 20 +-
fs/omfs/dir.c | 2 +-
fs/open.c | 2 +-
fs/openpromfs/inode.c | 2 +-
fs/orangefs/file.c | 4 +-
fs/orangefs/orangefs-kernel.h | 4 +-
fs/orangefs/xattr.c | 10 +-
fs/overlayfs/inode.c | 4 +-
fs/overlayfs/overlayfs.h | 4 +-
fs/overlayfs/readdir.c | 4 +-
fs/overlayfs/super.c | 2 +-
fs/posix_acl.c | 116 +++---
fs/proc/base.c | 35 +-
fs/proc/fd.c | 8 +-
fs/proc/generic.c | 2 +-
fs/proc/namespaces.c | 3 +-
fs/proc/proc_net.c | 2 +-
fs/proc/proc_sysctl.c | 17 +-
fs/proc/root.c | 4 +-
fs/qnx4/dir.c | 2 +-
fs/qnx6/dir.c | 2 +-
fs/read_write.c | 12 -
fs/readdir.c | 37 +-
fs/reiserfs/dir.c | 2 +-
fs/reiserfs/file.c | 6 +-
fs/reiserfs/ioctl.c | 6 +-
fs/reiserfs/namei.c | 18 +-
fs/reiserfs/xattr.c | 54 ---
fs/reiserfs/xattr.h | 9 +-
fs/reiserfs/xattr_acl.c | 8 +-
fs/reiserfs/xattr_security.c | 19 +-
fs/reiserfs/xattr_trusted.c | 19 +-
fs/reiserfs/xattr_user.c | 19 +-
fs/romfs/super.c | 4 +-
fs/splice.c | 3 +
fs/squashfs/dir.c | 4 +-
fs/squashfs/xattr.c | 6 +-
fs/sysv/dir.c | 2 +-
fs/ubifs/dir.c | 2 +-
fs/ubifs/ubifs.h | 4 +-
fs/ubifs/xattr.c | 6 +-
fs/udf/dir.c | 2 +-
fs/udf/namei.c | 2 +-
fs/ufs/dir.c | 16 +-
fs/ufs/super.c | 2 +-
fs/xattr.c | 12 +-
fs/xfs/xfs_acl.c | 20 +-
fs/xfs/xfs_file.c | 2 +-
fs/xfs/xfs_xattr.c | 6 +-
include/linux/dcache.h | 26 +-
include/linux/file.h | 13 +
include/linux/fs.h | 51 ++-
include/linux/nfs_fs.h | 11 +-
include/linux/nfs_xdr.h | 4 +-
include/linux/posix_acl.h | 1 -
include/linux/uio.h | 1 +
include/linux/xattr.h | 5 +-
include/trace/events/ext4.h | 6 +-
kernel/audit_watch.c | 2 +-
lib/iov_iter.c | 19 +
mm/shmem.c | 9 +-
net/socket.c | 2 +-
security/commoncap.c | 6 +-
security/integrity/evm/evm_main.c | 6 +-
security/selinux/hooks.c | 11 +-
security/smack/smack_lsm.c | 6 +-
200 files changed, 1545 insertions(+), 1300 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2016-05-17 6:27 ` Al Viro
@ 2016-05-17 18:27 ` Linus Torvalds
2016-05-17 20:11 ` Al Viro
0 siblings, 1 reply; 33+ messages in thread
From: Linus Torvalds @ 2016-05-17 18:27 UTC (permalink / raw)
To: Al Viro; +Cc: Linux Kernel Mailing List, linux-fsdevel
On Mon, May 16, 2016 at 11:27 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> FWIW, I think the least PITA would be if I send #work.lookups + backmerge from
> #ovl-fixes to resolve the fs/overlay/super.c conflict. If you think that
> it needs to done in even smaller steps (after all, it's about 3/4 of the
> entire pile), please say so.
That looked ok and at least separates out the other fluff from the real meat.
I would probably have preferred to get the "lookup" part separately as
a first merge, and then do the readdir work as an independent pull a
day or two later, just because they are reasonably independent.
But I took it this way as one bigger pull instead. With the
lookup_open() work being in the middle there, it wasn't a
black-and-white totally independent series anyway.
I tried to turn your description of the work into a reasonable merge
message, because I think that's a useful explanation of what went on
if there are issues. And while I hope that everything "just works",
this is definitely conceptually one of the biggest vfs changes we've
had in a long time. That directory semaphore serialization has been
there since pretty much day one. I'm happy with how relatively small
the actual changes end up being, but still..
I'll push out after my test-build, can you please then double-check
that everything looks good?
Thanks,
Linus
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2016-05-17 18:27 ` Linus Torvalds
@ 2016-05-17 20:11 ` Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2016-05-17 20:11 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Kernel Mailing List, linux-fsdevel
On Tue, May 17, 2016 at 11:27:15AM -0700, Linus Torvalds wrote:
> I tried to turn your description of the work into a reasonable merge
> message, because I think that's a useful explanation of what went on
> if there are issues. And while I hope that everything "just works",
> this is definitely conceptually one of the biggest vfs changes we've
> had in a long time. That directory semaphore serialization has been
> there since pretty much day one. I'm happy with how relatively small
> the actual changes end up being, but still..
>
> I'll push out after my test-build, can you please then double-check
> that everything looks good?
The merge looks sane...
^ permalink raw reply [flat|nested] 33+ messages in thread
* [git pull] vfs.git
@ 2016-11-17 5:55 Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2016-11-17 5:55 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
A couple of regression fixes.
The following changes since commit 961b708e95181041f403251f660bc70be3ff6ba3:
Merge tag 'drm-fixes-for-v4.9-rc6' of git://people.freedesktop.org/~airlied/linux (2016-11-16 17:24:21 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
for you to fetch changes up to 680bb946a1ae04fe0ff369a4965f76b48c07dc54:
fix iov_iter_advance() for ITER_PIPE (2016-11-17 00:00:48 -0500)
----------------------------------------------------------------
Abhi Das (1):
fix iov_iter_advance() for ITER_PIPE
Andreas Gruenbacher (1):
xattr: Fix setting security xattrs on sockfs
fs/xattr.c | 22 ++++++++++++++--------
lib/iov_iter.c | 4 +++-
net/socket.c | 15 +++++++++++++++
3 files changed, 32 insertions(+), 9 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [git pull] vfs.git
@ 2016-11-11 6:05 Al Viro
2016-11-11 17:25 ` Linus Torvalds
0 siblings, 1 reply; 33+ messages in thread
From: Al Viro @ 2016-11-11 6:05 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
Christoph's and Jan's aio fixes, fixup for generic_file_splice_read
(removal of pointless detritus that actually breaks it when used for gfs2
->splice_read()) and fixup for generic_file_read_iter() interaction with
ITER_PIPE destinations.
The following changes since commit a909d3e636995ba7c349e2ca5dbb528154d4ac30:
Linux 4.9-rc3 (2016-10-29 13:52:02 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
for you to fetch changes up to e519e7774784f3fa7728657d780863805ed1c983:
splice: remove detritus from generic_file_splice_read() (2016-11-10 18:32:13 -0500)
----------------------------------------------------------------
Al Viro (1):
splice: remove detritus from generic_file_splice_read()
Christoph Hellwig (3):
aio: hold an extra file reference over AIO read/write operations
fs: remove the never implemented aio_fsync file operation
fs: remove aio_run_iocb
Eryu Guan (1):
mm/filemap: don't allow partially uptodate page for pipes
Jan Kara (1):
aio: fix freeze protection of aio writes
Documentation/filesystems/Locking | 1 -
Documentation/filesystems/vfs.txt | 1 -
fs/aio.c | 207 ++++++++++++++++++++------------------
fs/ntfs/dir.c | 2 -
fs/splice.c | 5 -
include/linux/fs.h | 2 +-
mm/filemap.c | 3 +
7 files changed, 113 insertions(+), 108 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2016-11-11 6:05 Al Viro
@ 2016-11-11 17:25 ` Linus Torvalds
2016-11-11 18:06 ` Ilya Dryomov
2016-11-12 3:36 ` Yan, Zheng
0 siblings, 2 replies; 33+ messages in thread
From: Linus Torvalds @ 2016-11-11 17:25 UTC (permalink / raw)
To: Al Viro, Ilya Dryomov, Yan Zheng; +Cc: Linux Kernel Mailing List, linux-fsdevel
On Thu, Nov 10, 2016 at 10:05 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> Christoph's and Jan's aio fixes, fixup for generic_file_splice_read
> (removal of pointless detritus that actually breaks it when used for gfs2
> ->splice_read()) and fixup for generic_file_read_iter() interaction with
> ITER_PIPE destinations.
Hmm. I also just pulled the Ceph update that has commit 8a8d56176635
("ceph: use default file splice read callback"). I _think_ this splice
fix makes that ceph change unnecessary. But testing is always good.
Ilya? Can you double-check the current -git tree (well, what I *will*
push out soon after it has passed my build tests)?
Because I think Ceph can go back to using generic_file_splice_read again.
Linus
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2016-11-11 17:25 ` Linus Torvalds
@ 2016-11-11 18:06 ` Ilya Dryomov
2016-11-12 3:36 ` Yan, Zheng
1 sibling, 0 replies; 33+ messages in thread
From: Ilya Dryomov @ 2016-11-11 18:06 UTC (permalink / raw)
To: Linus Torvalds
Cc: Al Viro, Yan Zheng, Linux Kernel Mailing List, linux-fsdevel
On Fri, Nov 11, 2016 at 6:25 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Thu, Nov 10, 2016 at 10:05 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>> Christoph's and Jan's aio fixes, fixup for generic_file_splice_read
>> (removal of pointless detritus that actually breaks it when used for gfs2
>> ->splice_read()) and fixup for generic_file_read_iter() interaction with
>> ITER_PIPE destinations.
>
> Hmm. I also just pulled the Ceph update that has commit 8a8d56176635
> ("ceph: use default file splice read callback"). I _think_ this splice
> fix makes that ceph change unnecessary. But testing is always good.
>
> Ilya? Can you double-check the current -git tree (well, what I *will*
> push out soon after it has passed my build tests)?
>
> Because I think Ceph can go back to using generic_file_splice_read again.
Separate to Al's splice changes in this window, there is an old issue
where ceph manipulates page cache pages without the "buffer" capability
from the metadata server. Zheng is working on a fix and it's all tied
up together, so I'm not sure...
I'm afraid he called it a week already, but we will definitely look
into it.
Thanks,
Ilya
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2016-11-11 17:25 ` Linus Torvalds
2016-11-11 18:06 ` Ilya Dryomov
@ 2016-11-12 3:36 ` Yan, Zheng
1 sibling, 0 replies; 33+ messages in thread
From: Yan, Zheng @ 2016-11-12 3:36 UTC (permalink / raw)
To: Linus Torvalds
Cc: Al Viro, Ilya Dryomov, Linux Kernel Mailing List, linux-fsdevel
> On 12 Nov 2016, at 01:25, Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> On Thu, Nov 10, 2016 at 10:05 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>> Christoph's and Jan's aio fixes, fixup for generic_file_splice_read
>> (removal of pointless detritus that actually breaks it when used for gfs2
>> ->splice_read()) and fixup for generic_file_read_iter() interaction with
>> ITER_PIPE destinations.
>
> Hmm. I also just pulled the Ceph update that has commit 8a8d56176635
> ("ceph: use default file splice read callback"). I _think_ this splice
> fix makes that ceph change unnecessary. But testing is always good.
The commit is still needed. Al only fixes ITER_PIPE interaction with direct_IO. (it’s a no-op)
Cephfs case is special. Depending on what capabilities client has, client is allowed or
disallowed to read data from page cache. MDS changes client’s capabilities dynamically.
We don’t want to splice read fail when client is disallowed to get page from page cache.
Regards
Yan, Zheng
> Ilya? Can you double-check the current -git tree (well, what I *will*
> push out soon after it has passed my build tests)?
>
> Because I think Ceph can go back to using generic_file_splice_read again.
>
> Linus
^ permalink raw reply [flat|nested] 33+ messages in thread
* [git pull] vfs.git
@ 2016-10-11 3:07 Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2016-10-11 3:07 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
->rename2() work from Miklos + current_time() from Deepa.
The following changes since commit 08895a8b6b06ed2323cd97a36ee40a116b3db8ed:
Linux 4.8-rc8 (2016-09-25 18:47:13 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
for you to fetch changes up to 3873691e5ab34fa26948643d038a2b98c4437298:
Merge remote-tracking branch 'ovl/rename2' into for-linus (2016-10-10 23:02:51 -0400)
----------------------------------------------------------------
Al Viro (1):
Merge remote-tracking branch 'ovl/rename2' into for-linus
Deepa Dinamani (5):
vfs: Add current_time() api
fs: proc: Delete inode time initializations in proc_alloc_inode()
fs: Replace CURRENT_TIME with current_time() for inode timestamps
fs: Replace CURRENT_TIME_SEC with current_time() for inode timestamps
fs: Replace current_fs_time() with current_time()
Miklos Szeredi (7):
ncpfs: fix unused variable warning
fs: support RENAME_NOREPLACE for local filesystems
libfs: support RENAME_NOREPLACE in simple_rename()
fs: make remaining filesystems use .rename2
vfs: remove unused i_op->rename
fs: rename "rename2" i_op to "rename"
vfs: add note about i_op->rename changes to porting
Documentation/filesystems/Locking | 8 ++------
Documentation/filesystems/directory-locking | 2 +-
Documentation/filesystems/porting | 4 ++++
Documentation/filesystems/vfs.txt | 9 ++-------
arch/powerpc/platforms/cell/spufs/inode.c | 2 +-
arch/s390/hypfs/inode.c | 4 ++--
drivers/char/sonypi.c | 2 +-
drivers/infiniband/hw/qib/qib_fs.c | 2 +-
drivers/misc/ibmasm/ibmasmfs.c | 2 +-
drivers/oprofile/oprofilefs.c | 2 +-
drivers/platform/x86/sony-laptop.c | 2 +-
drivers/staging/lustre/lustre/llite/namei.c | 8 ++++++--
drivers/usb/core/devio.c | 18 +++++++++---------
drivers/usb/gadget/function/f_fs.c | 8 ++++----
drivers/usb/gadget/legacy/inode.c | 2 +-
fs/9p/v9fs.h | 3 ++-
fs/9p/vfs_inode.c | 8 ++++++--
fs/adfs/inode.c | 2 +-
fs/affs/affs.h | 3 ++-
fs/affs/amigaffs.c | 6 +++---
fs/affs/inode.c | 2 +-
fs/affs/namei.c | 6 +++++-
fs/afs/dir.c | 9 +++++++--
fs/attr.c | 2 +-
fs/autofs4/inode.c | 2 +-
fs/autofs4/root.c | 6 +++---
fs/bad_inode.c | 4 ++--
fs/bfs/dir.c | 20 ++++++++++++--------
fs/binfmt_misc.c | 2 +-
fs/btrfs/file.c | 6 +++---
fs/btrfs/inode.c | 24 ++++++++++++------------
fs/btrfs/ioctl.c | 8 ++++----
fs/btrfs/transaction.c | 4 ++--
fs/btrfs/xattr.c | 2 +-
fs/cachefiles/namei.c | 3 +--
fs/ceph/dir.c | 6 +++++-
fs/ceph/file.c | 4 ++--
fs/ceph/inode.c | 2 +-
fs/ceph/xattr.c | 2 +-
fs/cifs/cifsfs.c | 2 +-
fs/cifs/file.c | 4 ++--
fs/coda/dir.c | 8 ++++++--
fs/coda/file.c | 2 +-
fs/coda/inode.c | 2 +-
fs/configfs/inode.c | 6 +++---
fs/debugfs/inode.c | 4 ++--
fs/devpts/inode.c | 6 +++---
fs/ecryptfs/inode.c | 6 +++++-
fs/efivarfs/inode.c | 2 +-
fs/exofs/dir.c | 6 +++---
fs/exofs/inode.c | 4 ++--
fs/exofs/namei.c | 14 +++++++++-----
fs/ext2/acl.c | 2 +-
fs/ext2/dir.c | 6 +++---
fs/ext2/ialloc.c | 2 +-
fs/ext2/inode.c | 4 ++--
fs/ext2/ioctl.c | 4 ++--
fs/ext2/namei.c | 12 ++++++++----
fs/ext2/super.c | 2 +-
fs/ext2/xattr.c | 2 +-
fs/ext4/namei.c | 2 +-
fs/f2fs/dir.c | 8 ++++----
fs/f2fs/file.c | 8 ++++----
fs/f2fs/inline.c | 2 +-
fs/f2fs/namei.c | 14 +++++++-------
fs/f2fs/xattr.c | 2 +-
fs/fat/dir.c | 2 +-
fs/fat/file.c | 6 +++---
fs/fat/inode.c | 2 +-
fs/fat/namei_msdos.c | 18 +++++++++++-------
fs/fat/namei_vfat.c | 16 ++++++++++------
fs/fuse/control.c | 2 +-
fs/fuse/dir.c | 4 ++--
fs/gfs2/bmap.c | 8 ++++----
fs/gfs2/dir.c | 12 ++++++------
fs/gfs2/inode.c | 10 +++++-----
fs/gfs2/quota.c | 2 +-
fs/gfs2/xattr.c | 8 ++++----
fs/hfs/catalog.c | 8 ++++----
fs/hfs/dir.c | 8 ++++++--
fs/hfs/inode.c | 2 +-
fs/hfsplus/catalog.c | 8 ++++----
fs/hfsplus/dir.c | 12 ++++++++----
fs/hfsplus/inode.c | 2 +-
fs/hfsplus/ioctl.c | 2 +-
fs/hostfs/hostfs_kern.c | 2 +-
fs/hpfs/namei.c | 6 +++++-
fs/hugetlbfs/inode.c | 10 +++++-----
fs/inode.c | 29 ++++++++++++++++++++++++++---
fs/jffs2/acl.c | 2 +-
fs/jffs2/dir.c | 9 +++++++--
fs/jffs2/fs.c | 2 +-
fs/jfs/acl.c | 2 +-
fs/jfs/inode.c | 2 +-
fs/jfs/jfs_inode.c | 2 +-
fs/jfs/namei.c | 29 ++++++++++++++++-------------
fs/jfs/super.c | 2 +-
fs/jfs/xattr.c | 2 +-
fs/kernfs/dir.c | 6 +++++-
fs/kernfs/inode.c | 2 +-
fs/libfs.c | 20 ++++++++++++--------
fs/locks.c | 2 +-
fs/logfs/dir.c | 12 ++++++++----
fs/logfs/file.c | 2 +-
fs/logfs/inode.c | 4 ++--
fs/logfs/readwrite.c | 4 ++--
fs/minix/bitmap.c | 2 +-
fs/minix/dir.c | 6 +++---
fs/minix/itree_common.c | 4 ++--
fs/minix/namei.c | 10 +++++++---
fs/namei.c | 15 +++------------
fs/ncpfs/dir.c | 11 +++++++----
fs/nfs/dir.c | 6 +++++-
fs/nfs/internal.h | 3 ++-
fs/nfsd/blocklayout.c | 2 +-
fs/nilfs2/dir.c | 6 +++---
fs/nilfs2/inode.c | 4 ++--
fs/nilfs2/ioctl.c | 2 +-
fs/nilfs2/namei.c | 12 ++++++++----
fs/nsfs.c | 2 +-
fs/ntfs/inode.c | 2 +-
fs/ntfs/mft.c | 2 +-
fs/ocfs2/acl.c | 2 +-
fs/ocfs2/alloc.c | 2 +-
fs/ocfs2/aops.c | 2 +-
fs/ocfs2/dir.c | 4 ++--
fs/ocfs2/dlmfs/dlmfs.c | 4 ++--
fs/ocfs2/file.c | 12 ++++++------
fs/ocfs2/move_extents.c | 2 +-
fs/ocfs2/namei.c | 16 ++++++++++------
fs/ocfs2/refcounttree.c | 4 ++--
fs/ocfs2/xattr.c | 2 +-
fs/omfs/dir.c | 10 +++++++---
fs/omfs/inode.c | 2 +-
fs/openpromfs/inode.c | 2 +-
fs/orangefs/file.c | 2 +-
fs/orangefs/inode.c | 2 +-
fs/orangefs/namei.c | 16 ++++++++++------
fs/overlayfs/dir.c | 2 +-
fs/overlayfs/overlayfs.h | 4 ++--
fs/pipe.c | 2 +-
fs/posix_acl.c | 2 +-
fs/proc/base.c | 2 +-
fs/proc/inode.c | 3 +--
fs/proc/proc_sysctl.c | 2 +-
fs/proc/self.c | 2 +-
fs/proc/thread_self.c | 2 +-
fs/pstore/inode.c | 2 +-
fs/ramfs/inode.c | 6 +++---
fs/reiserfs/inode.c | 2 +-
fs/reiserfs/ioctl.c | 4 ++--
fs/reiserfs/namei.c | 18 +++++++++++-------
fs/reiserfs/stree.c | 8 ++++----
fs/reiserfs/super.c | 2 +-
fs/reiserfs/xattr.c | 6 +++---
fs/reiserfs/xattr_acl.c | 2 +-
fs/sysv/dir.c | 6 +++---
fs/sysv/ialloc.c | 2 +-
fs/sysv/itree.c | 4 ++--
fs/sysv/namei.c | 10 +++++++---
fs/tracefs/inode.c | 2 +-
fs/ubifs/dir.c | 8 ++++++--
fs/udf/ialloc.c | 2 +-
fs/udf/inode.c | 4 ++--
fs/udf/namei.c | 26 +++++++++++++++-----------
fs/ufs/dir.c | 6 +++---
fs/ufs/ialloc.c | 2 +-
fs/ufs/inode.c | 6 +++---
fs/ufs/namei.c | 12 ++++++++----
fs/xfs/xfs_acl.c | 2 +-
fs/xfs/xfs_inode.c | 2 +-
fs/xfs/xfs_iops.c | 6 +++---
fs/xfs/xfs_trans_inode.c | 2 +-
include/linux/fs.h | 6 +++---
ipc/mqueue.c | 18 +++++++++---------
kernel/bpf/inode.c | 2 +-
mm/shmem.c | 22 +++++++++++-----------
net/sunrpc/rpc_pipe.c | 2 +-
security/apparmor/apparmorfs.c | 2 +-
security/inode.c | 2 +-
security/selinux/selinuxfs.c | 2 +-
security/tomoyo/realpath.c | 4 ++--
182 files changed, 587 insertions(+), 449 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [git pull] vfs.git
@ 2016-03-20 1:44 Al Viro
2016-03-20 1:55 ` Linus Torvalds
0 siblings, 1 reply; 33+ messages in thread
From: Al Viro @ 2016-03-20 1:44 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
Preparations of parallel lookups (the remaining main obstacle is the
need to move security_d_instantiate(); once that becomes safe, the rest will
be a matter of rather short series local to fs/*.c) + preadv2/pwritev2 series
from Christoph + assorted fixes.
The following changes since commit f93812846f31381d35c04c6c577d724254355e7f:
jffs2: reduce the breakage on recovery from halfway failed rename() (2016-03-07 23:07:10 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
for you to fetch changes up to 8b23a8ce1094f25a85826e25217c5b9779a4f5aa:
Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next (2016-03-18 16:07:38 -0400)
----------------------------------------------------------------
Al Viro (25):
ecryptfs_lookup(): use lookup_one_len_unlocked()
ecryptfs_encrypt_and_encode_filename(): drop unused argument
Merge branch 'for-linus' into work.lookups
do_last(): reorder and simplify a bit
lookup_dcache(): lift d_alloc() into callers
namei: untanlge lookup_fast()
namei: change calling conventions for lookup_{fast,slow} and follow_managed()
namei: simplify invalidation logics in lookup_dcache()
lookup_one_len_unlocked(): use lookup_dcache()
namei: massage lookup_slow() to be usable by lookup_one_len_unlocked()
namei: teach lookup_slow() to skip revalidate
ceph: don't bother with d_rehash() in splice_dentry()
configfs: move d_rehash() into configfs_create() for regular files
autofs4: don't bother with d_instantiate(dentry, NULL) in ->lookup()
ceph_fill_trace(): don't bother with d_instantiate(dn, NULL)
kill dentry_unhash()
nfs_lookup: don't bother with d_instantiate(dentry, NULL)
cifs_get_root(): use lookup_one_len_unlocked()
quota: use lookup_one_len_unlocked()
replace d_add_unique() with saner primitive
uninline d_add()
untangle fsnotify_d_instantiate() a bit
don't bother with __d_instantiate(dentry, NULL)
dcache.c: new helper: __d_add()
Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next
Christoph Hellwig (5):
vfs: pass a flags argument to vfs_readv/vfs_writev
x86: wire up preadv2 and pwritev2
vfs: add the RWF_HIPRI flag for preadv2/pwritev2
direct-io: only use block polling if explicitly requested
blk-mq: enable polling support by default
David Howells (1):
CacheFiles: Provide read-and-reset release counters for cachefilesd
Dmitry V. Levin (1):
vfs: show_vfsstat: do not ignore errors from show_devname method
Milosz Tanski (1):
vfs: vfs: Define new syscalls preadv2,pwritev2
Rabin Vincent (1):
splice: handle zero nr_pages in splice_to_pipe()
arch/x86/entry/syscalls/syscall_32.tbl | 2 +
arch/x86/entry/syscalls/syscall_64.tbl | 2 +
fs/autofs4/root.c | 2 -
fs/cachefiles/daemon.c | 13 +-
fs/cachefiles/interface.c | 11 +-
fs/cachefiles/internal.h | 4 +
fs/cachefiles/namei.c | 28 ++-
fs/ceph/inode.c | 21 +--
fs/cifs/cifsfs.c | 4 +-
fs/configfs/dir.c | 9 +-
fs/configfs/inode.c | 12 +-
fs/dcache.c | 177 ++++++++++---------
fs/direct-io.c | 3 +-
fs/ecryptfs/crypto.c | 27 +--
fs/ecryptfs/ecryptfs_kernel.h | 1 -
fs/ecryptfs/inode.c | 11 +-
fs/namei.c | 309 ++++++++++++++-------------------
fs/nfs/dir.c | 12 +-
fs/nfs/nfs4proc.c | 13 +-
fs/nfsd/vfs.c | 4 +-
fs/proc_namespace.c | 2 +
fs/quota/dquot.c | 4 +-
fs/read_write.c | 197 ++++++++++++++++-----
fs/splice.c | 5 +-
include/linux/blkdev.h | 3 +-
include/linux/compat.h | 6 +
include/linux/dcache.h | 33 +---
include/linux/fs.h | 10 +-
include/linux/fsnotify.h | 9 -
include/linux/fsnotify_backend.h | 9 +-
include/linux/namei.h | 1 +
include/linux/syscalls.h | 6 +
include/uapi/linux/fs.h | 3 +
33 files changed, 488 insertions(+), 465 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2016-03-20 1:44 Al Viro
@ 2016-03-20 1:55 ` Linus Torvalds
2016-03-20 1:59 ` Al Viro
0 siblings, 1 reply; 33+ messages in thread
From: Linus Torvalds @ 2016-03-20 1:55 UTC (permalink / raw)
To: Al Viro; +Cc: Linux Kernel Mailing List, linux-fsdevel
On Sat, Mar 19, 2016 at 6:44 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> Preparations of parallel lookups (the remaining main obstacle is the
> need to move security_d_instantiate(); once that becomes safe, the rest will
> be a matter of rather short series local to fs/*.c) + preadv2/pwritev2 series
> from Christoph + assorted fixes.
So this:
> Al Viro:
> replace d_add_unique() with saner primitive
ends up conflicting with commit d9dfd8d74168 ("NFSv4: Fix a dentry
leak on alias use").
>From what I can tell, your version doesn't have the leak issue, so my
merge resolution is to just take your new code as-is, but I'd ask you
to double-check my logic.
(I haven't pushed out the merge yet, it's still going through my build
test. Soon, but I guess you can just take a look at that dentry leak
commit regardless).
Linus
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2016-03-20 1:55 ` Linus Torvalds
@ 2016-03-20 1:59 ` Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2016-03-20 1:59 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Kernel Mailing List, linux-fsdevel
On Sat, Mar 19, 2016 at 06:55:21PM -0700, Linus Torvalds wrote:
> On Sat, Mar 19, 2016 at 6:44 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> > Preparations of parallel lookups (the remaining main obstacle is the
> > need to move security_d_instantiate(); once that becomes safe, the rest will
> > be a matter of rather short series local to fs/*.c) + preadv2/pwritev2 series
> > from Christoph + assorted fixes.
>
> So this:
>
> > Al Viro:
> > replace d_add_unique() with saner primitive
>
> ends up conflicting with commit d9dfd8d74168 ("NFSv4: Fix a dentry
> leak on alias use").
>
> >From what I can tell, your version doesn't have the leak issue, so my
> merge resolution is to just take your new code as-is, but I'd ask you
> to double-check my logic.
>
> (I haven't pushed out the merge yet, it's still going through my build
> test. Soon, but I guess you can just take a look at that dentry leak
> commit regardless).
It does contain an equivalent of the leak fix, and yes, resolution should
be "take the variant from vfs.git in the area of conflict".
In fact, I was just pondering whether to send a followup describing the
conflict resolution (== take the variant from vfs.git in the area of
conflict) or leave it be as too trivial. Should've sent...
^ permalink raw reply [flat|nested] 33+ messages in thread
* [git pull] vfs.git
@ 2015-04-24 20:40 Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2015-04-24 20:40 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
d_inode() annotations from David Howells (sat in for-next since
before the beginning of merge window) + four assorted fixes. FWIW,
the only things here that had been worked on during the merge window are
regression fix for 9p readdir breakage and unlazy_walk() misuse fix...
Please, pull from
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
There are several trivial conflicts (fixes had sat in -next all that
time); proposed resolution is in #proposed-merge.
Shortlog:
Al Viro (1):
RCU pathwalk breakage when running into a symlink overmounting something
David Howells (15):
VFS: AF_UNIX sockets should call mknod on the top layer only
VFS: Cachefiles should perform fs modifications on the top layer only
VFS: Fix up some ->d_inode accesses in the chelsio driver
VFS: audit: d_backing_inode() annotations
VFS: kernel/: d_inode() annotations
VFS: net/unix: d_backing_inode() annotations
VFS: net/: d_inode() annotations
VFS: security/: d_backing_inode() annotations
VFS: security/: d_inode() annotations
VFS: normal filesystems (and lustre): d_inode() annotations
VFS: assorted weird filesystems: d_inode() annotations
VFS: fs library helpers: d_inode() annotations
VFS: fs/cachefiles: d_backing_inode() annotations
VFS: fs/inode.c helpers: d_inode() annotations
VFS: assorted d_backing_inode() annotations
Eric Sandeen (1):
fix I_DIO_WAKEUP definition
Jens Axboe (1):
direct-io: only inc/dec inode->i_dio_count for file systems
Johannes Berg (1):
fs/9p: fix readdir()
Diffstat:
arch/ia64/kernel/perfmon.c | 2 +-
arch/powerpc/platforms/cell/spufs/inode.c | 22 +--
arch/s390/hypfs/inode.c | 18 +--
arch/x86/kvm/assigned-dev.c | 2 +-
drivers/base/devtmpfs.c | 32 ++--
drivers/block/drbd/drbd_debugfs.c | 8 +-
drivers/infiniband/hw/ipath/ipath_fs.c | 16 +-
drivers/infiniband/hw/qib/qib_fs.c | 20 +--
drivers/mtd/ubi/build.c | 6 +-
drivers/mtd/ubi/kapi.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 21 +--
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 2 -
drivers/oprofile/oprofilefs.c | 16 +-
drivers/staging/lustre/lustre/llite/dcache.c | 14 +-
drivers/staging/lustre/lustre/llite/file.c | 16 +-
.../staging/lustre/lustre/llite/llite_internal.h | 2 +-
drivers/staging/lustre/lustre/llite/llite_lib.c | 6 +-
drivers/staging/lustre/lustre/llite/llite_nfs.c | 6 +-
drivers/staging/lustre/lustre/llite/namei.c | 20 +--
drivers/staging/lustre/lustre/llite/statahead.c | 28 ++--
drivers/staging/lustre/lustre/llite/symlink.c | 2 +-
drivers/staging/lustre/lustre/llite/xattr.c | 8 +-
drivers/usb/gadget/legacy/inode.c | 2 +-
fs/9p/acl.c | 4 +-
fs/9p/vfs_dentry.c | 4 +-
fs/9p/vfs_dir.c | 2 +
fs/9p/vfs_inode.c | 34 ++---
fs/9p/vfs_inode_dotl.c | 16 +-
fs/9p/vfs_super.c | 8 +-
fs/adfs/inode.c | 2 +-
fs/affs/amigaffs.c | 8 +-
fs/affs/inode.c | 2 +-
fs/affs/namei.c | 10 +-
fs/afs/dir.c | 42 +++---
fs/afs/inode.c | 4 +-
fs/afs/mntpt.c | 8 +-
fs/afs/super.c | 2 +-
fs/autofs4/autofs_i.h | 4 +-
fs/autofs4/expire.c | 2 +-
fs/autofs4/inode.c | 6 +-
fs/autofs4/root.c | 18 +--
fs/autofs4/symlink.c | 2 +-
fs/autofs4/waitq.c | 4 +-
fs/befs/linuxvfs.c | 4 +-
fs/bfs/dir.c | 8 +-
fs/binfmt_misc.c | 16 +-
fs/block_dev.c | 5 +-
fs/btrfs/export.c | 6 +-
fs/btrfs/file.c | 2 +-
fs/btrfs/inode.c | 36 ++---
fs/btrfs/ioctl.c | 22 +--
fs/btrfs/super.c | 8 +-
fs/btrfs/tree-log.c | 14 +-
fs/btrfs/xattr.c | 16 +-
fs/cachefiles/bind.c | 10 +-
fs/cachefiles/interface.c | 6 +-
fs/cachefiles/namei.c | 122 +++++++--------
fs/cachefiles/rdwr.c | 14 +-
fs/cachefiles/security.c | 6 +-
fs/cachefiles/xattr.c | 22 +--
fs/ceph/caps.c | 2 +-
fs/ceph/debugfs.c | 2 +-
fs/ceph/dir.c | 60 ++++----
fs/ceph/export.c | 28 ++--
fs/ceph/file.c | 4 +-
fs/ceph/inode.c | 52 +++----
fs/ceph/mds_client.c | 24 +--
fs/ceph/super.c | 4 +-
fs/ceph/xattr.c | 16 +-
fs/cifs/cifs_dfs_ref.c | 2 +-
fs/cifs/cifsfs.c | 2 +-
fs/cifs/cifssmb.c | 4 +-
fs/cifs/dir.c | 8 +-
fs/cifs/file.c | 48 +++---
fs/cifs/inode.c | 32 ++--
fs/cifs/link.c | 12 +-
fs/cifs/misc.c | 2 +-
fs/cifs/readdir.c | 4 +-
fs/cifs/smb1ops.c | 2 +-
fs/cifs/smb2file.c | 4 +-
fs/cifs/smb2misc.c | 4 +-
fs/cifs/smb2ops.c | 10 +-
fs/cifs/xattr.c | 22 +--
fs/coda/cache.c | 4 +-
fs/coda/dir.c | 22 +--
fs/coda/inode.c | 6 +-
fs/coda/pioctl.c | 2 +-
fs/coda/upcall.c | 4 +-
fs/configfs/dir.c | 70 ++++-----
fs/configfs/file.c | 4 +-
fs/configfs/inode.c | 16 +-
fs/dax.c | 4 +-
fs/debugfs/file.c | 2 +-
fs/debugfs/inode.c | 56 +++----
fs/devpts/inode.c | 16 +-
fs/direct-io.c | 7 +-
fs/ecryptfs/crypto.c | 4 +-
fs/ecryptfs/dentry.c | 6 +-
fs/ecryptfs/file.c | 2 +-
fs/ecryptfs/inode.c | 164 ++++++++++-----------
fs/ecryptfs/kthread.c | 2 +-
fs/ecryptfs/main.c | 6 +-
fs/ecryptfs/mmap.c | 2 +-
fs/efivarfs/inode.c | 4 +-
fs/efivarfs/super.c | 2 +-
fs/efs/namei.c | 4 +-
fs/exofs/dir.c | 4 +-
fs/exofs/inode.c | 2 +-
fs/exofs/namei.c | 10 +-
fs/exofs/super.c | 2 +-
fs/exofs/symlink.c | 2 +-
fs/ext2/dir.c | 2 +-
fs/ext2/ialloc.c | 2 +-
fs/ext2/inode.c | 2 +-
fs/ext2/namei.c | 14 +-
fs/ext2/symlink.c | 2 +-
fs/ext2/xattr.c | 4 +-
fs/ext2/xattr_security.c | 4 +-
fs/ext2/xattr_trusted.c | 4 +-
fs/ext2/xattr_user.c | 4 +-
fs/ext3/ialloc.c | 2 +-
fs/ext3/inode.c | 2 +-
fs/ext3/namei.c | 34 ++---
fs/ext3/super.c | 6 +-
fs/ext3/symlink.c | 2 +-
fs/ext3/xattr.c | 10 +-
fs/ext3/xattr_security.c | 4 +-
fs/ext3/xattr_trusted.c | 4 +-
fs/ext3/xattr_user.c | 4 +-
fs/ext4/fsync.c | 2 +-
fs/ext4/ialloc.c | 2 +-
fs/ext4/indirect.c | 6 +-
fs/ext4/inline.c | 4 +-
fs/ext4/inode.c | 8 +-
fs/ext4/migrate.c | 2 +-
fs/ext4/namei.c | 34 ++---
fs/ext4/super.c | 6 +-
fs/ext4/symlink.c | 2 +-
fs/ext4/xattr.c | 10 +-
fs/ext4/xattr_security.c | 4 +-
fs/ext4/xattr_trusted.c | 4 +-
fs/ext4/xattr_user.c | 4 +-
fs/f2fs/f2fs.h | 2 +-
fs/f2fs/file.c | 4 +-
fs/f2fs/namei.c | 18 +--
fs/f2fs/xattr.c | 10 +-
fs/fat/file.c | 4 +-
fs/fat/namei_msdos.c | 8 +-
fs/fat/namei_vfat.c | 14 +-
fs/fat/nfs.c | 4 +-
fs/freevxfs/vxfs_immed.c | 2 +-
fs/fuse/control.c | 6 +-
fs/fuse/dir.c | 60 ++++----
fs/fuse/inode.c | 4 +-
fs/gfs2/dentry.c | 12 +-
fs/gfs2/export.c | 8 +-
fs/gfs2/inode.c | 34 ++---
fs/gfs2/ops_fstype.c | 8 +-
fs/gfs2/super.c | 2 +-
fs/gfs2/xattr.c | 6 +-
fs/hfs/attr.c | 6 +-
fs/hfs/dir.c | 8 +-
fs/hfs/inode.c | 2 +-
fs/hfs/sysdep.c | 2 +-
fs/hfsplus/dir.c | 12 +-
fs/hfsplus/inode.c | 2 +-
fs/hfsplus/ioctl.c | 2 +-
fs/hfsplus/xattr.c | 4 +-
fs/hfsplus/xattr.h | 4 +-
fs/hostfs/hostfs_kern.c | 2 +-
fs/hpfs/inode.c | 2 +-
fs/hpfs/namei.c | 8 +-
fs/hppfs/hppfs.c | 20 +--
fs/hugetlbfs/inode.c | 4 +-
fs/inode.c | 20 +--
fs/isofs/export.c | 2 +-
fs/jffs2/dir.c | 40 ++---
fs/jffs2/fs.c | 2 +-
fs/jffs2/security.c | 4 +-
fs/jffs2/super.c | 4 +-
fs/jffs2/symlink.c | 2 +-
fs/jffs2/xattr.c | 2 +-
fs/jffs2/xattr_trusted.c | 4 +-
fs/jffs2/xattr_user.c | 4 +-
fs/jfs/file.c | 2 +-
fs/jfs/namei.c | 18 +--
fs/jfs/symlink.c | 2 +-
fs/jfs/xattr.c | 12 +-
fs/kernfs/dir.c | 2 +-
fs/kernfs/inode.c | 8 +-
fs/libfs.c | 26 ++--
fs/logfs/dir.c | 14 +-
fs/logfs/file.c | 2 +-
fs/minix/dir.c | 4 +-
fs/minix/file.c | 2 +-
fs/minix/inode.c | 4 +-
fs/minix/namei.c | 10 +-
fs/namei.c | 6 +-
fs/ncpfs/dir.c | 48 +++---
fs/ncpfs/inode.c | 6 +-
fs/ncpfs/ioctl.c | 8 +-
fs/ncpfs/ncplib_kernel.c | 2 +-
fs/ncpfs/symlink.c | 2 +-
fs/nfs/dir.c | 59 ++++----
fs/nfs/direct.c | 14 +-
fs/nfs/getroot.c | 4 +-
fs/nfs/inode.c | 18 +--
fs/nfs/namespace.c | 10 +-
fs/nfs/nfs3acl.c | 2 +-
fs/nfs/nfs3proc.c | 12 +-
fs/nfs/nfs4client.c | 2 +-
fs/nfs/nfs4file.c | 4 +-
fs/nfs/nfs4namespace.c | 4 +-
fs/nfs/nfs4proc.c | 60 ++++----
fs/nfs/nfs4state.c | 4 +-
fs/nfs/nfs4trace.h | 4 +-
fs/nfs/pagelist.c | 2 +-
fs/nfs/pnfs.h | 4 +-
fs/nfs/proc.c | 4 +-
fs/nfs/read.c | 2 +-
fs/nfs/super.c | 6 +-
fs/nfs/symlink.c | 2 +-
fs/nfs/unlink.c | 20 +--
fs/nfs/write.c | 8 +-
fs/nfsd/export.c | 4 +-
fs/nfsd/nfs2acl.c | 8 +-
fs/nfsd/nfs3acl.c | 8 +-
fs/nfsd/nfs3proc.c | 6 +-
fs/nfsd/nfs3xdr.c | 16 +-
fs/nfsd/nfs4acl.c | 4 +-
fs/nfsd/nfs4proc.c | 12 +-
fs/nfsd/nfs4recover.c | 22 +--
fs/nfsd/nfs4state.c | 4 +-
fs/nfsd/nfs4xdr.c | 10 +-
fs/nfsd/nfsfh.c | 20 +--
fs/nfsd/nfsfh.h | 6 +-
fs/nfsd/nfsproc.c | 4 +-
fs/nfsd/nfsxdr.c | 2 +-
fs/nfsd/vfs.c | 62 ++++----
fs/nfsd/xdr4.h | 2 +-
fs/nilfs2/dir.c | 2 +-
fs/nilfs2/inode.c | 2 +-
fs/nilfs2/namei.c | 18 +--
fs/nilfs2/super.c | 6 +-
fs/nsfs.c | 4 +-
fs/ntfs/inode.c | 2 +-
fs/ntfs/namei.c | 4 +-
fs/ocfs2/dcache.c | 14 +-
fs/ocfs2/dir.h | 2 +-
fs/ocfs2/dlmfs/dlmfs.c | 4 +-
fs/ocfs2/export.c | 2 +-
fs/ocfs2/file.c | 8 +-
fs/ocfs2/inode.c | 2 +-
fs/ocfs2/namei.c | 14 +-
fs/ocfs2/refcounttree.c | 10 +-
fs/ocfs2/xattr.c | 22 +--
fs/omfs/dir.c | 10 +-
fs/omfs/file.c | 2 +-
fs/pipe.c | 2 +-
fs/posix_acl.c | 8 +-
fs/proc/base.c | 32 ++--
fs/proc/fd.c | 6 +-
fs/proc/generic.c | 4 +-
fs/proc/inode.c | 2 +-
fs/proc/namespaces.c | 4 +-
fs/proc/proc_net.c | 2 +-
fs/proc/proc_sysctl.c | 12 +-
fs/proc/root.c | 2 +-
fs/proc/self.c | 2 +-
fs/proc/thread_self.c | 2 +-
fs/pstore/inode.c | 10 +-
fs/qnx6/inode.c | 2 +-
fs/quota/dquot.c | 10 +-
fs/ramfs/file-nommu.c | 2 +-
fs/reiserfs/dir.c | 4 +-
fs/reiserfs/inode.c | 2 +-
fs/reiserfs/namei.c | 12 +-
fs/reiserfs/super.c | 4 +-
fs/reiserfs/xattr.c | 126 ++++++++--------
fs/reiserfs/xattr.h | 2 +-
fs/reiserfs/xattr_security.c | 10 +-
fs/reiserfs/xattr_trusted.c | 10 +-
fs/reiserfs/xattr_user.c | 4 +-
fs/squashfs/export.c | 2 +-
fs/squashfs/xattr.c | 8 +-
fs/stat.c | 4 +-
fs/sysv/dir.c | 4 +-
fs/sysv/file.c | 2 +-
fs/sysv/itree.c | 2 +-
fs/sysv/namei.c | 10 +-
fs/sysv/symlink.c | 2 +-
fs/ubifs/dir.c | 14 +-
fs/ubifs/file.c | 4 +-
fs/ubifs/journal.c | 4 +-
fs/ubifs/xattr.c | 10 +-
fs/udf/file.c | 2 +-
fs/udf/namei.c | 16 +-
fs/ufs/dir.c | 2 +-
fs/ufs/namei.c | 10 +-
fs/ufs/super.c | 4 +-
fs/ufs/symlink.c | 2 +-
fs/ufs/truncate.c | 2 +-
fs/xfs/xfs_export.c | 2 +-
fs/xfs/xfs_filestream.c | 2 +-
fs/xfs/xfs_ioctl.c | 18 +--
fs/xfs/xfs_ioctl32.c | 12 +-
fs/xfs/xfs_iops.c | 20 +--
fs/xfs/xfs_super.c | 2 +-
fs/xfs/xfs_xattr.c | 6 +-
include/linux/fs.h | 31 +++-
include/trace/events/btrfs.h | 4 +-
include/trace/events/ext3.h | 16 +-
include/trace/events/ext4.h | 16 +-
ipc/mqueue.c | 22 +--
ipc/shm.c | 2 +-
kernel/audit.c | 2 +-
kernel/audit_tree.c | 4 +-
kernel/audit_watch.c | 14 +-
kernel/auditsc.c | 6 +-
kernel/relay.c | 4 +-
kernel/trace/trace.c | 8 +-
kernel/trace/trace_events.c | 4 +-
kernel/trace/trace_uprobe.c | 2 +-
mm/shmem.c | 30 ++--
net/socket.c | 6 +-
net/sunrpc/rpc_pipe.c | 32 ++--
net/unix/af_unix.c | 8 +-
net/unix/diag.c | 2 +-
security/apparmor/apparmorfs.c | 2 +-
security/apparmor/file.c | 6 +-
security/apparmor/lsm.c | 18 +--
security/commoncap.c | 6 +-
security/inode.c | 18 +--
security/integrity/evm/evm_crypto.c | 4 +-
security/integrity/evm/evm_main.c | 18 +--
security/integrity/ima/ima_appraise.c | 10 +-
security/lsm_audit.c | 4 +-
security/security.c | 50 +++----
security/selinux/hooks.c | 36 ++---
security/selinux/selinuxfs.c | 2 +-
security/smack/smack_lsm.c | 46 +++---
security/smack/smackfs.c | 2 +-
security/tomoyo/condition.c | 2 +-
security/tomoyo/realpath.c | 10 +-
344 files changed, 1875 insertions(+), 1864 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [GIT PULL] vfs.git
@ 2014-12-10 19:13 Al Viro
2014-12-11 16:18 ` Miklos Szeredi
0 siblings, 1 reply; 33+ messages in thread
From: Al Viro @ 2014-12-10 19:13 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
First pile out of several (there _definitely_ will be more). Stuff in this
one:
* unification of d_splice_alias()/d_materialize_unique()
* iov_iter rewrite
* killing a bunch of ->f_path.dentry users (and f_dentry macro).
Getting that completed will make life much simpler for unionmount/overlayfs,
since then we'll be able to limit the places sensitive to file _dentry_
to reasonably few. Which allows to have file_inode(file) pointing to
inode in a covered layer, with dentry pointing to (negative) dentry in
union one. Still not complete, but much closer now.
* crapectomy in lustre (dead code removal, mostly)
* "let's make seq_printf return nothing" preparations
* assorted cleanups and fixes
There _definitely_ will be more piles. Please, pull from
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
Shortlog:
Al Viro (53):
new helper: is_root_inode()
move d_rcu from overlapping d_child to overlapping d_alias
lustre: switch ll_intent_file_open() to struct dentry *
ll_setxattr(): get rid of struct file on stack
lustre: opened file can't have negative dentry
lustre: use %p[dD]
lustre: use file_inode()
lustre: switch ll_release_openhandle() to struct inode *
kill ll_mknod_generic()
kill ll_mkdir_generic()
kill ll_symlink_generic()
ll_new_inode(): don't bother with name - it's always &dentry->d_name
kill ll_rmdir_generic()
kill ll_unlink_generic()
kill ll_rename_generic()
ll_get_child_fid(): callers already have the child
kill ll_link_generic()
lustre: get rid of duplicate mountpoint checks
lustre: use is_root_inode()
deal with deadlock in d_walk()
gfs2: bugger off early if O_CREAT open finds a directory
gfs2_create_inode(): don't bother with d_splice_alias()
gfs2_atomic_open(): simplify the use of finish_no_open()
d_add_ci() should just accept a hashed exact match if it finds one
merge d_materialise_unique() into d_splice_alias()
switch d_materialise_unique() users to d_splice_alias()
assorted conversions to %p[dD]
nfsd/nfsctl.c: new helper
btrfs: get rid of f_dentry use
cifs: get rid of ->f_path.dentry->d_sb uses, add a new helper
afs_fsync: don't bother with ->f_path.dentry
rpc_pipefs.c: get rid of f_dentry
nfsd: get rid of ->f_dentry
procfs: get rid of ->f_dentry
lockd: get rid of ->f_path.dentry->d_sb
kill f_dentry uses
ncpfs: use file_inode()
nfsd_vfs_write(): use file_inode()
new helper: audit_file()
kill f_dentry macro
iov_iter.c: macros for iterating over iov_iter
iov_iter.c: iterate_and_advance
iov_iter.c: convert iov_iter_npages() to iterate_all_kinds
iov_iter.c: convert iov_iter_get_pages() to iterate_all_kinds
iov_iter.c: convert iov_iter_get_pages_alloc() to iterate_all_kinds
iov_iter.c: convert iov_iter_zero() to iterate_and_advance
iov_iter.c: get rid of bvec_copy_page_{to,from}_iter()
iov_iter.c: convert copy_from_iter() to iterate_and_advance
iov_iter.c: convert copy_to_iter() to iterate_and_advance
iov_iter.c: handle ITER_KVEC directly
csum_and_copy_..._iter()
new helper: iov_iter_kvec()
copy_from_iter_nocache()
Joe Perches (6):
seq_file: Rename seq_overflow() to seq_has_overflowed() and make public
netfilter: Convert print_tuple functions to return void
dlm: Remove seq_printf() return checks and use seq_has_overflowed()
dlm: Use seq_puts() instead of seq_printf() for constant strings
fs: Convert show_fdinfo functions to void
debugfs: Have debugfs_print_regs32() return void
Miklos Szeredi (1):
vfs: make first argument of dir_context.actor typed
Mikulas Patocka (1):
dcache: fix kmemcheck warning in switch_names
Steven Rostedt (Red Hat) (2):
netfilter: Remove return values for print_conntrack callbacks
netfilter: Remove checks of seq_printf() return values
Diffstat:
Documentation/filesystems/debugfs.txt | 2 +-
Documentation/filesystems/nfs/Exporting | 23 +-
Documentation/filesystems/porting | 8 +
Documentation/filesystems/seq_file.txt | 22 +-
Documentation/filesystems/vfs.txt | 2 +-
arch/alpha/kernel/osf_sys.c | 7 +-
arch/parisc/hpux/fs.c | 7 +-
arch/powerpc/oprofile/cell/spu_task_sync.c | 10 +-
arch/powerpc/platforms/cell/spufs/inode.c | 2 +-
arch/s390/hypfs/hypfs_dbfs.c | 3 +-
arch/x86/ia32/ia32_aout.c | 8 +-
drivers/block/drbd/drbd_debugfs.c | 6 +-
drivers/gpu/drm/armada/armada_gem.c | 2 +-
drivers/media/pci/zoran/zoran_procfs.c | 4 +-
drivers/misc/genwqe/card_dev.c | 2 +-
drivers/net/tun.c | 4 +-
drivers/s390/char/hmcdrv_dev.c | 16 +-
drivers/scsi/lpfc/lpfc_debugfs.c | 8 +-
drivers/staging/lustre/lustre/libcfs/tracefile.c | 4 +-
drivers/staging/lustre/lustre/llite/dcache.c | 21 +-
drivers/staging/lustre/lustre/llite/dir.c | 9 +-
drivers/staging/lustre/lustre/llite/file.c | 158 ++-
.../staging/lustre/lustre/llite/llite_internal.h | 10 +-
drivers/staging/lustre/lustre/llite/llite_lib.c | 8 +-
drivers/staging/lustre/lustre/llite/llite_mmap.c | 12 +-
drivers/staging/lustre/lustre/llite/llite_nfs.c | 8 +-
drivers/staging/lustre/lustre/llite/lloop.c | 7 +-
drivers/staging/lustre/lustre/llite/namei.c | 388 +++----
drivers/staging/lustre/lustre/llite/statahead.c | 33 +-
drivers/staging/lustre/lustre/llite/vvp_io.c | 4 +-
drivers/staging/lustre/lustre/llite/xattr.c | 9 +-
fs/9p/vfs_inode.c | 2 +-
fs/9p/vfs_inode_dotl.c | 4 +-
fs/affs/amigaffs.c | 2 +-
fs/affs/inode.c | 4 +-
fs/affs/namei.c | 40 +-
fs/afs/dir.c | 80 +-
fs/afs/inode.c | 4 +-
fs/afs/mntpt.c | 22 +-
fs/afs/write.c | 9 +-
fs/autofs4/expire.c | 42 +-
fs/autofs4/root.c | 25 +-
fs/befs/linuxvfs.c | 16 +-
fs/binfmt_aout.c | 8 +-
fs/btrfs/inode.c | 2 +-
fs/btrfs/ioctl.c | 2 +-
fs/cachefiles/namei.c | 21 +-
fs/cachefiles/xattr.c | 15 +-
fs/ceph/debugfs.c | 14 +-
fs/ceph/dir.c | 56 +-
fs/ceph/file.c | 6 +-
fs/ceph/inode.c | 18 +-
fs/cifs/cifsfs.c | 3 +-
fs/cifs/cifsglob.h | 6 +
fs/cifs/file.c | 12 +-
fs/cifs/inode.c | 2 +-
fs/cifs/readdir.c | 10 +-
fs/coda/cache.c | 2 +-
fs/coda/coda_linux.c | 6 -
fs/coda/coda_linux.h | 1 -
fs/coda/dir.c | 12 +-
fs/compat.c | 21 +-
fs/configfs/dir.c | 2 +-
fs/dcache.c | 271 ++---
fs/debugfs/file.c | 15 +-
fs/debugfs/inode.c | 2 +-
fs/dlm/debug_fs.c | 263 +++--
fs/ecryptfs/crypto.c | 2 +-
fs/ecryptfs/file.c | 6 +-
fs/ecryptfs/mmap.c | 2 +-
fs/efivarfs/file.c | 4 +-
fs/eventfd.c | 9 +-
fs/eventpoll.c | 13 +-
fs/exportfs/expfs.c | 7 +-
fs/fat/dir.c | 5 +-
fs/fuse/dir.c | 4 +-
fs/fuse/file.c | 2 +-
fs/gfs2/export.c | 8 +-
fs/gfs2/inode.c | 26 +-
fs/hppfs/hppfs.c | 5 +-
fs/jfs/namei.c | 18 +-
fs/kernfs/dir.c | 2 +-
fs/libfs.c | 12 +-
fs/lockd/svcsubs.c | 2 +-
fs/ncpfs/dir.c | 12 +-
fs/ncpfs/file.c | 14 +-
fs/ncpfs/mmap.c | 4 +-
fs/ncpfs/ncplib_kernel.h | 4 +-
fs/nfs/blocklayout/rpc_pipefs.c | 2 +-
fs/nfs/dir.c | 6 +-
fs/nfs/getroot.c | 4 +-
fs/nfsd/nfs4recover.c | 7 +-
fs/nfsd/nfs4xdr.c | 2 +-
fs/nfsd/nfsctl.c | 37 +-
fs/nfsd/vfs.c | 16 +-
fs/nfsd/vfs.h | 4 +-
fs/notify/fdinfo.c | 78 +-
fs/notify/fdinfo.h | 4 +-
fs/notify/fsnotify.c | 4 +-
fs/ntfs/namei.c | 4 +-
fs/ocfs2/dcache.c | 20 +-
fs/ocfs2/dir.c | 8 +-
fs/ocfs2/dlmfs/dlmfs.c | 4 +-
fs/ocfs2/dlmglue.c | 3 +-
fs/ocfs2/journal.c | 8 +-
fs/open.c | 4 +-
fs/overlayfs/readdir.c | 8 +-
fs/proc/base.c | 4 +-
fs/proc/fd.c | 3 +-
fs/readdir.c | 21 +-
fs/reiserfs/xattr.c | 21 +-
fs/seq_file.c | 15 +-
fs/signalfd.c | 4 +-
fs/sync.c | 2 +-
fs/timerfd.c | 27 +-
fs/xattr.c | 16 +-
include/linux/audit.h | 9 +
include/linux/cgroup.h | 4 +-
include/linux/dcache.h | 9 +-
include/linux/debugfs.h | 7 +-
include/linux/fs.h | 13 +-
include/linux/seq_file.h | 15 +
include/linux/uio.h | 6 +
include/net/netfilter/nf_conntrack_core.h | 2 +-
include/net/netfilter/nf_conntrack_l3proto.h | 4 +-
include/net/netfilter/nf_conntrack_l4proto.h | 6 +-
ipc/mqueue.c | 4 +-
kernel/auditsc.c | 7 +-
kernel/events/core.c | 2 +-
kernel/taskstats.c | 2 +-
kernel/trace/trace.c | 4 +-
kernel/trace/trace_events.c | 2 +-
mm/iov_iter.c | 1058 ++++++++------------
mm/memcontrol.c | 4 +-
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +-
.../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 53 +-
net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 10 +-
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 6 +-
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 10 +-
net/netfilter/nf_conntrack_l3proto_generic.c | 5 +-
net/netfilter/nf_conntrack_proto_dccp.c | 14 +-
net/netfilter/nf_conntrack_proto_generic.c | 5 +-
net/netfilter/nf_conntrack_proto_gre.c | 18 +-
net/netfilter/nf_conntrack_proto_sctp.c | 14 +-
net/netfilter/nf_conntrack_proto_tcp.c | 14 +-
net/netfilter/nf_conntrack_proto_udp.c | 10 +-
net/netfilter/nf_conntrack_proto_udplite.c | 10 +-
net/netfilter/nf_conntrack_standalone.c | 77 +-
net/netfilter/nf_log.c | 30 +-
net/netfilter/nfnetlink_queue_core.c | 13 +-
net/netfilter/x_tables.c | 19 +-
net/netfilter/xt_hashlimit.c | 36 +-
security/commoncap.c | 2 +-
security/integrity/ima/ima_api.c | 4 +-
security/integrity/ima/ima_appraise.c | 4 +-
security/integrity/ima/ima_template_lib.c | 2 +-
security/selinux/selinuxfs.c | 6 +-
security/smack/smack_lsm.c | 8 +-
158 files changed, 1675 insertions(+), 2183 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [GIT PULL] vfs.git
2014-12-10 19:13 [GIT PULL] vfs.git Al Viro
@ 2014-12-11 16:18 ` Miklos Szeredi
2014-12-11 18:06 ` Al Viro
0 siblings, 1 reply; 33+ messages in thread
From: Miklos Szeredi @ 2014-12-11 16:18 UTC (permalink / raw)
To: Al Viro; +Cc: Linus Torvalds, LKML, linux-fsdevel
On Wed, Dec 10, 2014 at 8:13 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> * killing a bunch of ->f_path.dentry users (and f_dentry macro).
> Getting that completed will make life much simpler for unionmount/overlayfs,
> since then we'll be able to limit the places sensitive to file _dentry_
> to reasonably few. Which allows to have file_inode(file) pointing to
> inode in a covered layer, with dentry pointing to (negative) dentry in
> union one. Still not complete, but much closer now.
If we want f_path to point to union path, then shouldn't we be hiding
it from all but core VFS? Filesystems have no business looking at the
mount anyway. And looking at the union dentry will be just an endless
source of bugs.
Also some API changes are in order, like passing dentry to ->iterate()
for "readdirplus" like operations, since f_path.dentry won't be usable
for that purpose. Alternatively replace f_inode with f_dentry and
make file_inode() use that.
Thanks,
Miklos
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [GIT PULL] vfs.git
2014-12-11 16:18 ` Miklos Szeredi
@ 2014-12-11 18:06 ` Al Viro
2014-12-11 18:34 ` Al Viro
0 siblings, 1 reply; 33+ messages in thread
From: Al Viro @ 2014-12-11 18:06 UTC (permalink / raw)
To: Miklos Szeredi; +Cc: Linus Torvalds, LKML, linux-fsdevel
On Thu, Dec 11, 2014 at 05:18:21PM +0100, Miklos Szeredi wrote:
> On Wed, Dec 10, 2014 at 8:13 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> > * killing a bunch of ->f_path.dentry users (and f_dentry macro).
> > Getting that completed will make life much simpler for unionmount/overlayfs,
> > since then we'll be able to limit the places sensitive to file _dentry_
> > to reasonably few. Which allows to have file_inode(file) pointing to
> > inode in a covered layer, with dentry pointing to (negative) dentry in
> > union one. Still not complete, but much closer now.
>
> If we want f_path to point to union path, then shouldn't we be hiding
> it from all but core VFS? Filesystems have no business looking at the
> mount anyway. And looking at the union dentry will be just an endless
> source of bugs.
>
> Also some API changes are in order, like passing dentry to ->iterate()
> for "readdirplus" like operations, since f_path.dentry won't be usable
> for that purpose. Alternatively replace f_inode with f_dentry and
> make file_inode() use that.
Check the remaining users of ->f_path.dentry. I agree that they ought to
be encapsulated into a sane set of helpers - raw access to ->f_path in
filesystems is asking for serious trouble. And we have very few such places
remaining.
FWIW, I would prefer to have the whole stack of underlying dentries reachable
in a uniform way...
PS: I'll send review of your multilayer stuff today.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [GIT PULL] vfs.git
2014-12-11 18:06 ` Al Viro
@ 2014-12-11 18:34 ` Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2014-12-11 18:34 UTC (permalink / raw)
To: Miklos Szeredi; +Cc: Linus Torvalds, LKML, linux-fsdevel
On Thu, Dec 11, 2014 at 06:06:24PM +0000, Al Viro wrote:
> Check the remaining users of ->f_path.dentry. I agree that they ought to
> be encapsulated into a sane set of helpers - raw access to ->f_path in
> filesystems is asking for serious trouble. And we have very few such places
> remaining.
Sloppy writing: insert "with the exception of filesystems that are not
going to be suitable for any form of stacking" - there _is_ a bunch of
debugfs, configfs, kernfs places using that. They'd also better be
taken care of, but it's an independent story; for overlayfs/unionmount/etc.
purposes they are non-issue.
BTW, there are several places where ->f_path.mnt access is the right thing
to do - in autofs. Also a non-issue here...
^ permalink raw reply [flat|nested] 33+ messages in thread
* [git pull] vfs.git
@ 2014-11-05 13:57 Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2014-11-05 13:57 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
Another overlayfs fix. Please, pull from the usual place:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
Shortlog:
Miklos Szeredi (1):
ovl: don't poison cursor
Diffstat:
fs/overlayfs/readdir.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [git pull] vfs.git
@ 2014-11-02 5:58 Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2014-11-02 5:58 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
A bunch of assorted fixes, most of them - followups to overlayfs
merge. Please, pull from the usual place:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
Shortlog:
Al Viro (3):
overlayfs: barriers for opening upper-layer directory
isofs_cmp(): we'll never see a dentry for . or ..
isofs: don't bother with ->d_op for normal case
Daniel Thompson (1):
staging: android: logger: Fix log corruption regression
David Jeffery (1):
Return short read or 0 at end of a raw device, not EIO
Miklos Szeredi (3):
ovl: fix check for cursor
overlayfs: fix lockdep misannotation
ovl: initialize ->is_cursor
Paul E. McKenney (1):
rcu: Provide counterpart to rcu_dereference() for non-RCU situations
Diffstat:
drivers/char/raw.c | 2 +-
drivers/staging/android/logger.c | 13 ++++++++-----
fs/block_dev.c | 3 ++-
fs/isofs/inode.c | 24 ++----------------------
fs/isofs/namei.c | 22 ++++------------------
fs/namei.c | 2 +-
fs/overlayfs/readdir.c | 17 ++++++++++-------
include/linux/fs.h | 10 +++++++---
include/linux/rcupdate.h | 15 +++++++++++++++
9 files changed, 50 insertions(+), 58 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [git pull] vfs.git
@ 2014-10-26 3:04 Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2014-10-26 3:04 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
overlayfs merge + leak fix for d_splice_alias() failure exits.
Please, pull from the usual place:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
Shortlog:
Al Viro (5):
fix inode leaks on d_splice_alias() failure exits
overlayfs: don't hold ->i_mutex over opening the real directory
overlayfs: make ovl_cache_entry->name an array instead of pointer
overlayfs: embed root into overlay_readdir_data
overlayfs: embed middle into overlay_readdir_data
Andy Whitcroft (1):
overlayfs: add statfs support
Erez Zadok (1):
overlayfs: implement show_options
Miklos Szeredi (11):
vfs: add i_op->dentry_open()
vfs: export do_splice_direct() to modules
vfs: export __inode_permission() to modules
vfs: introduce clone_private_mount()
vfs: export check_sticky()
vfs: add whiteout support
vfs: add RENAME_WHITEOUT
ext4: support RENAME_WHITEOUT
shmem: support RENAME_WHITEOUT
overlay filesystem
fs: limit filesystem stacking depth
Neil Brown (1):
overlay: overlay filesystem documentation
Diffstat:
Documentation/filesystems/Locking | 2 +
Documentation/filesystems/overlayfs.txt | 198 +++++++
Documentation/filesystems/vfs.txt | 7 +
MAINTAINERS | 7 +
fs/Kconfig | 1 +
fs/Makefile | 1 +
fs/btrfs/ioctl.c | 20 +-
fs/dcache.c | 2 +
fs/ecryptfs/main.c | 7 +
fs/ext4/namei.c | 95 +++-
fs/internal.h | 7 -
fs/namei.c | 41 +-
fs/namespace.c | 27 +
fs/open.c | 23 +-
fs/overlayfs/Kconfig | 10 +
fs/overlayfs/Makefile | 7 +
fs/overlayfs/copy_up.c | 414 ++++++++++++++
fs/overlayfs/dir.c | 921 +++++++++++++++++++++++++++++++
fs/overlayfs/inode.c | 425 ++++++++++++++
fs/overlayfs/overlayfs.h | 191 +++++++
fs/overlayfs/readdir.c | 590 ++++++++++++++++++++
fs/overlayfs/super.c | 796 ++++++++++++++++++++++++++
fs/splice.c | 1 +
include/linux/fs.h | 39 ++
include/linux/mount.h | 3 +
include/uapi/linux/fs.h | 1 +
mm/shmem.c | 36 +-
27 files changed, 3814 insertions(+), 58 deletions(-)
create mode 100644 Documentation/filesystems/overlayfs.txt
create mode 100644 fs/overlayfs/Kconfig
create mode 100644 fs/overlayfs/Makefile
create mode 100644 fs/overlayfs/copy_up.c
create mode 100644 fs/overlayfs/dir.c
create mode 100644 fs/overlayfs/inode.c
create mode 100644 fs/overlayfs/overlayfs.h
create mode 100644 fs/overlayfs/readdir.c
create mode 100644 fs/overlayfs/super.c
^ permalink raw reply [flat|nested] 33+ messages in thread* [git pull] vfs.git
@ 2014-05-28 6:38 Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2014-05-28 6:38 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-fsdevel
Oh, well... Still nothing useful on that livelock (I had something
that looked kinda-sorta like a non-invasive solution, but it deadlocks), so
it's just Miklos' vmsplice fix for now. Please, pull from the usual place -
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
Shortlog:
Miklos Szeredi (1):
vfs: fix vmplice_to_user()
Diffstat:
fs/splice.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
PS: livelock looks triggerable without check_submounts_and_drop() anywhere
in sight - vfs_rmdir() does shrink_dcache_parent() on prospective victim
right before calling ->rmdir(). So rmdir a vs rmdir a/b/c will get you
shrink_dcache_parent() on a and a/b/c at the same time - no locks in common
there. So we'll probably need to shift those calls after successful calls
of ->rmdir() (and similar in overwriting ->rename()), in addition to whatever
we cook in check_submounts_and_drop()...
I still would like to see detailed traces on what gets triggered by udev -
hopefully the patch I've sent to Mika won't disrupt the livelock by printks
it's doing ;-/
^ permalink raw reply [flat|nested] 33+ messages in thread* [git pull] vfs.git
@ 2014-04-12 12:40 Al Viro
2014-04-13 18:53 ` Geert Uytterhoeven
0 siblings, 1 reply; 33+ messages in thread
From: Al Viro @ 2014-04-12 12:40 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
The first vfs pile, with deep apologies for being very late in this window.
Assorted cleanups and fixes, plus a large preparatory part of iov_iter work.
There's a lot more of that, but it'll probably go into the next merge window
- it *does* shape up nicely, removes a lot of boilerplate, gets rid of
locking inconsistencie between aio_write and splice_write and I hope to get
Kent's direct-io rewrite merged into the same queue, but some of the stuff
after this point is having (mostly trivial) conflicts with the things already
merged into mainline and with some I want more testing.
This one passes LTP and xfstests without regressions, in addition to usual
beating. BTW, readahead02 in ltp syscalls testsuite has started giving
failures since "mm/readahead.c: fix readahead failure for memoryless NUMA
nodes and limit readahead pages" - might be a false positive, might be
a real regression...
The conflicts are trivial (variable added in mainline next to one removed
in this series, a function removed in mainline next to several removed in
this, new object added in mm/Makefile, a function call in fs/ceph/file.c
replaced with several lines equivalent to it next to an if that was added
after that call in mainline). I've pushed a resolved variant into
vfs.git#proposed-merge, but that's mostly for verification purposes.
There will be another pile, with bits and pieces from other folks; I want
to deal with the bulk of that mess first...
The branch itself is in the usual place -
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
Shortlog:
Al Viro (61):
smarter propagate_mnt()
reduce m_start() cost...
usbip: don't open-code sockfd_lookup/sockfd_put
vhost: don't open-code sockfd_put()
switch nbd to sockfd_lookup/sockfd_put
ncpfs: switch to sockfd_lookup()/sockfd_put()
don't bother with {get,put}_write_access() on non-regular files
get rid of DEBUG_WRITECOUNT
fold __get_file_write_access() into its only caller
mark struct file that had write access grabbed by open()
tidy do_dentry_open() up a bit
get_write_access() is inlined, exporting it is pointless
namei.c: move EXPORT_SYMBOL to corresponding definitions
get rid of files_defer_init()
lustre: generic_readlink() is just fine there, TYVM...
new helper: readlink_copy()
ntfs: don't put NULL into ->i_op/->i_fop
get rid of pointless checks for NULL ->i_op
cifs: ->rename() without ->lookup() makes no sense
mn10300: kmap_atomic() returns void *, not unsigned long...
fuse/dev: use atomic maps
pipe: kill ->map() and ->unmap()
switch ->is_partially_uptodate() to saner arguments
callers of iov_copy_from_user_atomic() don't need pagecache_disable()
do_shmem_file_read(): call file_read_actor() directly
introduce copy_page_to_iter, kill loop over iovec in generic_file_aio_read()
cifs_iovec_read(): resubmit shouldn't restart the loop
switch pipe_read() to copy_page_to_iter()
switch vmsplice_to_user() to copy_page_to_iter()
cifs_iovec_read: keep iov_iter between the calls of cifs_readdata_to_iov()
fold cifs_iovec_read() into its (only) caller
read_code(): go through vfs_read() instead of calling the method directly
untangling process_vm_..., part 1
untangling process_vm_..., part 2
untangling process_vm_..., part 3
untangling process_vm_..., part 4
process_vm_access: switch to iov_iter
process_vm_access: switch to copy_page_to_iter/iov_iter_copy_from_user
process_vm_access: take get_user_pages/put_pages one level up
process_vm_rw_pages(): pass accurate amount of bytes
process_vm_access: don't bother with returning the amounts of bytes copied
process_vm_access: tidy up a bit
take iov_iter stuff to mm/iov_iter.c
ocfs2: don't open-code kernel_sendmsg()
lustre: switch to kernel_sendmsg()
constify blk_rq_map_user_iov() and friends
drbd: don't open-code kernel_recvmsg()
ocfs2: don't open-code kernel_recvmsg()
lustre: don't open-code kernel_recvmsg()
kill the 4th argument of __generic_file_aio_write()
kill the 5th argument of generic_file_buffered_write()
btrfs_file_aio_write(): get rid of ppos
generic_file_direct_write(): get rid of ppos argument
export generic_perform_write(), start getting rid of generic_file_buffer_write()
xfs_file_buffered_aio_write(): switch to generic_perform_write()
ceph_aio_write(): switch to generic_perform_write()
ocfs2_file_aio_write(): switch to generic_perform_write()
kill generic_file_buffered_write()
ceph_sync_{,direct_}write: fix an oops on ceph_osdc_new_request() failure
cifs: fix the race in cifs_writev()
missing bits of "splice: fix racy pipe->buffers uses"
David Howells (1):
VFS: Make delayed_free() call free_vfsmnt()
Kent Overstreet (1):
iov_iter: Move iov_iter to uio.h
Diffstat:
Documentation/filesystems/Locking | 2 +-
Documentation/filesystems/vfs.txt | 2 +-
arch/mn10300/include/asm/highmem.h | 4 +-
arch/powerpc/configs/ppc6xx_defconfig | 1 -
arch/powerpc/configs/ps3_defconfig | 1 -
arch/s390/configs/default_defconfig | 1 -
arch/sh/configs/rsk7203_defconfig | 1 -
arch/xtensa/configs/iss_defconfig | 1 -
arch/xtensa/configs/s6105_defconfig | 1 -
block/blk-map.c | 2 +-
drivers/block/drbd/drbd_receiver.c | 12 +-
drivers/block/nbd.c | 48 ++-
drivers/char/virtio_console.c | 4 +-
.../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 60 +---
.../lustre/lustre/libcfs/linux/linux-tcpip.c | 24 +-
drivers/staging/lustre/lustre/llite/symlink.c | 23 +-
drivers/staging/usbip/stub_dev.c | 8 +-
drivers/staging/usbip/usbip_common.c | 25 --
drivers/staging/usbip/usbip_common.h | 1 -
drivers/staging/usbip/vhci_hcd.c | 4 +-
drivers/staging/usbip/vhci_sysfs.c | 6 +-
drivers/vhost/net.c | 14 +-
fs/bio.c | 10 +-
fs/block_dev.c | 2 +-
fs/btrfs/file.c | 16 +-
fs/buffer.c | 6 +-
fs/cachefiles/bind.c | 1 -
fs/cachefiles/namei.c | 3 +-
fs/ceph/file.c | 12 +-
fs/cifs/cifsfs.c | 1 -
fs/cifs/file.c | 128 +++-----
fs/exec.c | 2 +-
fs/ext4/file.c | 2 +-
fs/file.c | 11 +-
fs/file_table.c | 43 +--
fs/fuse/dev.c | 14 +-
fs/fuse/file.c | 5 +-
fs/mount.h | 5 +-
fs/namei.c | 67 ++--
fs/namespace.c | 56 ++--
fs/ncpfs/inode.c | 50 +--
fs/ncpfs/ncp_fs_sb.h | 2 -
fs/ntfs/inode.c | 2 -
fs/ocfs2/cluster/tcp.c | 49 +--
fs/ocfs2/file.c | 9 +-
fs/open.c | 68 +---
fs/pipe.c | 133 +-------
fs/pnode.c | 198 ++++++-----
fs/pnode.h | 3 +
fs/proc/namespaces.c | 14 +-
fs/proc/self.c | 2 +-
fs/proc_namespace.c | 1 +
fs/splice.c | 126 ++-----
fs/udf/file.c | 2 +-
fs/xfs/xfs_file.c | 13 +-
fs/xfs/xfs_ioctl.c | 28 +-
include/linux/bio.h | 5 +-
include/linux/blkdev.h | 4 +-
include/linux/buffer_head.h | 4 +-
include/linux/fdtable.h | 2 -
include/linux/fs.h | 97 +-----
include/linux/mount.h | 3 +
include/linux/nbd.h | 3 +-
include/linux/pipe_fs_i.h | 19 --
include/linux/uio.h | 52 +++
kernel/relay.c | 4 +-
kernel/trace/trace.c | 8 +-
lib/Kconfig.debug | 10 -
mm/Makefile | 2 +-
mm/filemap.c | 344 ++++----------------
mm/iov_iter.c | 224 +++++++++++++
mm/process_vm_access.c | 250 +++++---------
mm/shmem.c | 79 ++---
security/integrity/evm/evm_crypto.c | 2 +-
security/integrity/evm/evm_main.c | 2 +-
security/tomoyo/realpath.c | 4 +-
76 files changed, 910 insertions(+), 1537 deletions(-)
create mode 100644 mm/iov_iter.c
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2014-04-12 12:40 Al Viro
@ 2014-04-13 18:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 33+ messages in thread
From: Geert Uytterhoeven @ 2014-04-13 18:53 UTC (permalink / raw)
To: Al Viro
Cc: Linus Torvalds, linux-kernel, Linux FS Devel, Stephen Rothwell,
Linux-Next
Hi Al,
On Sat, Apr 12, 2014 at 2:40 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> The first vfs pile, with deep apologies for being very late in this window.
Can we please have vfs.git in -next in the future, before it has been
pulled into mainline?
I (read: Google) also couldn't find any evindence of patch submissions to
public mailing lists. I admit I only looked for the two commits that
introduced issues I just sent patches for.
Thanks for your understanding!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 33+ messages in thread
* [git pull] vfs.git
@ 2013-11-11 16:30 Al Viro
2013-11-13 14:52 ` J. Bruce Fields
0 siblings, 1 reply; 33+ messages in thread
From: Al Viro @ 2013-11-11 16:30 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
All kinds of stuff this time around; some more notable parts:
* RCU'd vfsmounts handling
* new primitives for coredump handling
* files_lock is gone
* Bruce's delegations handling series
* exportfs fixes
plus misc stuff all over the place. There's one trivial conflict with
mainline - drivers/usb/core/file.c (whitespace noise on mainline side
vs. switch to replace_fops() on vfs.git one); no other conflicts. Please,
pull from
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
Shortlog:
Al Viro (72):
9p: make v9fs_cache_inode_{get,put,set}_cookie empty inlines for !9P_CACHEFS
ecryptfs: check DCACHE_OP_REVALIDATE instead of ->d_op
ecryptfs: don't leave RCU pathwalk immediately
ecryptfs: get rid of ecryptfs_set_dentry_lower{,_mnt}
ecryptfs: ->lower_path.dentry is never NULL
libfs: get exports to definitions of objects being exported...
new helper: kfree_put_link()
befs: split symlink iops in two - for short and long symlinks resp.
nfs: use %p[dD] instead of open-coded (and often racy) equivalents
nfsd: switch to %p[dD]
sunrpc: switch to %pd
ubifs: switch to %pd
ncpfs: switch to %p[dD]
put_mnt_ns(): use drop_collected_mounts()
consolidate the reassignments of ->f_op in ->open() instances
dmxdev: get rid of pointless clearing ->f_op
rtl8188eu: remove dead code
file->f_op is never NULL...
initialize namespace_sem statically
fs_is_visible only needs namespace_sem held shared
dup_mnt_ns(): get rid of pointless grabbing of vfsmount_lock
do_remount(): pull touch_mnt_namespace() up
fold mntfree() into mntput_no_expire()
fs/namespace.c: bury long-dead define
finish_automount() doesn't need vfsmount_lock for removal from expiry list
mnt_set_expiry() doesn't need vfsmount_lock
fold dup_mnt_ns() into its only surviving caller
namespace.c: get rid of mnt_ghosts
don't bother with vfsmount_lock in mounts_poll()
new helpers: lock_mount_hash/unlock_mount_hash
isofs: don't pass dentry to isofs_hash{i,}_common()
uninline destroy_super(), consolidate alloc_super()
split __lookup_mnt() in two functions
move taking vfsmount_lock down into prepend_path()
make freeing super_block rcu-delayed
hpfs: make freeing sbi and codetables rcu-delayed
adfs: delayed freeing of sbi
autofs4: make freeing sbi rcu-delayed
cifs: rcu-delay unload_nls() and freeing sbi
fat: rcu-delay unloading nls and freeing sbi
ncpfs: rcu-delay unload_nls() and freeing ncp_server
pid_namespace: make freeing struct pid_namespace rcu-delayed
fuse: rcu-delay freeing fuse_conn
switch shrink_dcache_for_umount() to use of d_walk()
RCU'd vfsmounts
get rid of {lock,unlock}_rcu_walk()
get rid of s_files and files_lock
fold __d_shrink() into its only remaining caller
coda_revalidate_inode(): switch to passing inode...
no need to keep brlock macros anymore...
restore 32bit aout coredump
new helper: dump_emit()
switch elf_core_write_extra_phdrs() to dump_emit()
switch elf_core_write_extra_data() to dump_emit()
binfmt_elf: convert writing actual dump pages to dump_emit()
convert the rest of binfmt_elf_fdpic to dump_emit()
switch elf_coredump_extra_notes_write() to dump_emit()
aout: switch to dump_emit
binfmt_elf: count notes towards coredump limit
make dump_emit() use vfs_write() instead of banging at ->f_op->write directly
dump_skip(): dump_seek() replacement taking coredump_params
spufs: get rid of dump_emit() wrappers
new helper: dump_align()
take anon inode allocation to libfs.c
... and kill anon_inode_getfile_private()
constify copy_siginfo_to_user{,32}()
constify do_coredump() argument
elf{,_fdpic} coredump: get rid of pointless if (siginfo->si_signo)
iget/iget5: don't bother with ->i_lock until we find a match
qnx4: i_sb is never NULL
ocfs2: get rid of impossible checks
ecryptfs: ->f_op is never NULL
Benjamin LaHaise (1):
rework aio migrate pages to use aio fs
Christoph Hellwig (1):
exportfs: BUG_ON in crazy corner case
David Howells (1):
VFS: Put a small type field into struct dentry::d_flags
J. Bruce Fields (25):
vfs: split out vfs_getattr_nosec
exportfs: fix 32-bit nfsd handling of 64-bit inode numbers
dcache: use IS_ROOT to decide where dentry is hashed
dcache: Don't set DISCONNECTED on "pseudo filesystem" dentries
dcache: don't clear DCACHE_DISCONNECTED too early
dcache: fix outdated DCACHE_NEED_LOOKUP comment
exportfs: more detailed comment for path_reconnect
exportfs: clear DISCONNECTED on all parents sooner
exportfs: stop retrying once we race with rename/remove
exportfs: eliminate unused "noprogress" counter
exportfs: move most of reconnect_path to helper function
exportfs: better variable name
exportfs: fix quadratic behavior in filehandle lookup
vfs: pull ext4's double-i_mutex-locking into common code
vfs: don't use PARENT/CHILD lock classes for non-directories
vfs: rename I_MUTEX_QUOTA now that it's not used for quotas
vfs: take i_mutex on renamed file
locks: introduce new FL_DELEG lock flag
locks: implement delegations
namei: minor vfs_unlink cleanup
locks: break delegations on unlink
locks: helper functions for delegation breaking
locks: break delegations on rename
locks: break delegations on link
locks: break delegations on any attribute modification
Miklos Szeredi (1):
vfs: introduce d_instantiate_no_diralias()
Diffstat:
Documentation/filesystems/directory-locking | 31 ++-
Documentation/filesystems/porting | 8 +
arch/arm64/kernel/signal32.c | 2 +-
arch/ia64/kernel/elfcore.c | 12 +-
arch/ia64/kernel/signal.c | 2 +-
arch/mips/kernel/signal32.c | 2 +-
arch/parisc/kernel/signal32.c | 2 +-
arch/parisc/kernel/signal32.h | 2 +-
arch/powerpc/include/asm/spu.h | 3 +-
arch/powerpc/kernel/signal_32.c | 2 +-
arch/powerpc/platforms/cell/spu_syscalls.c | 5 +-
arch/powerpc/platforms/cell/spufs/coredump.c | 89 ++----
arch/powerpc/platforms/cell/spufs/spufs.h | 3 +-
arch/s390/kernel/compat_signal.c | 2 +-
arch/sparc/kernel/signal32.c | 2 +-
arch/tile/kernel/compat_signal.c | 2 +-
arch/x86/ia32/ia32_aout.c | 86 +++---
arch/x86/ia32/ia32_signal.c | 2 +-
arch/x86/um/elfcore.c | 15 +-
drivers/base/devtmpfs.c | 6 +-
drivers/char/misc.c | 12 +-
drivers/gpu/drm/drm_fops.c | 17 +-
drivers/media/dvb-core/dmxdev.c | 4 -
drivers/media/dvb-core/dvbdev.c | 19 +-
drivers/mtd/nand/nandsim.c | 2 +-
drivers/staging/comedi/comedi_compat32.c | 3 -
.../lustre/lustre/include/linux/lustre_compat25.h | 4 +-
drivers/staging/lustre/lustre/llite/namei.c | 2 +-
drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 2 +-
drivers/staging/rtl8188eu/include/osdep_service.h | 5 -
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 208 -----------
drivers/usb/core/file.c | 16 +-
fs/9p/cache.h | 12 +
fs/9p/vfs_file.c | 2 -
fs/9p/vfs_inode.c | 6 -
fs/9p/vfs_inode_dotl.c | 4 -
fs/adfs/adfs.h | 9 +-
fs/adfs/super.c | 3 +-
fs/aio.c | 63 +++-
fs/anon_inodes.c | 114 +------
fs/attr.c | 25 ++-
fs/autofs4/autofs_i.h | 3 +-
fs/autofs4/dev-ioctl.c | 6 -
fs/autofs4/inode.c | 13 +-
fs/befs/linuxvfs.c | 61 ++--
fs/binfmt_aout.c | 13 +-
fs/binfmt_elf.c | 127 +++----
fs/binfmt_elf_fdpic.c | 152 +++------
fs/binfmt_em86.c | 2 +-
fs/cachefiles/interface.c | 4 +-
fs/cachefiles/namei.c | 4 +-
fs/char_dev.c | 6 +-
fs/cifs/cifs_fs_sb.h | 1 +
fs/cifs/cifsfs.c | 2 +-
fs/cifs/cifsfs.h | 2 -
fs/cifs/connect.c | 10 +-
fs/cifs/link.c | 7 -
fs/coda/coda_linux.h | 2 +-
fs/coda/dir.c | 6 +-
fs/coda/file.c | 6 +-
fs/coda/inode.c | 2 +-
fs/compat_ioctl.c | 4 +-
fs/coredump.c | 71 +++--
fs/dcache.c | 342 ++++++++++--------
fs/ecryptfs/dentry.c | 29 +-
fs/ecryptfs/ecryptfs_kernel.h | 19 +-
fs/ecryptfs/file.c | 8 +-
fs/ecryptfs/inode.c | 29 +-
fs/ecryptfs/main.c | 3 +-
fs/eventpoll.c | 2 +-
fs/exec.c | 35 +-
fs/exportfs/expfs.c | 269 ++++++++------
fs/ext4/ext4.h | 2 -
fs/ext4/ioctl.c | 4 +-
fs/ext4/move_extent.c | 40 +--
fs/fat/fat.h | 1 +
fs/fat/inode.c | 19 +-
fs/fcntl.c | 5 +-
fs/file_table.c | 129 +-------
fs/fs-writeback.c | 1 +
fs/fuse/cuse.c | 2 +-
fs/fuse/dir.c | 40 +--
fs/fuse/fuse_i.h | 5 +-
fs/fuse/inode.c | 4 +-
fs/gfs2/inode.c | 9 +-
fs/hpfs/hpfs_fn.h | 1 +
fs/hpfs/namei.c | 2 +-
fs/hpfs/super.c | 28 +-
fs/inode.c | 62 +++-
fs/internal.h | 7 -
fs/ioctl.c | 4 +-
fs/isofs/inode.c | 12 +-
fs/libfs.c | 122 +++++--
fs/locks.c | 69 +++-
fs/mount.h | 20 +-
fs/namei.c | 322 ++++++++++-------
fs/namespace.c | 390 ++++++++++----------
fs/ncpfs/dir.c | 55 +--
fs/ncpfs/file.c | 12 +-
fs/ncpfs/inode.c | 19 +-
fs/ncpfs/ncp_fs_sb.h | 2 +-
fs/nfs/dir.c | 119 +++----
fs/nfs/direct.c | 17 +-
fs/nfs/file.c | 117 +++----
fs/nfs/namespace.c | 5 +-
fs/nfs/nfs3proc.c | 8 +-
fs/nfs/nfs4file.c | 4 +-
fs/nfs/nfs4namespace.c | 7 +-
fs/nfs/nfs4proc.c | 5 +-
fs/nfs/proc.c | 8 +-
fs/nfs/unlink.c | 9 +-
fs/nfs/write.c | 6 +-
fs/nfsd/nfs4recover.c | 12 +-
fs/nfsd/nfs4state.c | 17 +-
fs/nfsd/nfsfh.c | 28 +-
fs/nfsd/nfsfh.h | 4 +-
fs/nfsd/vfs.c | 23 +-
fs/ntfs/inode.c | 2 +-
fs/ocfs2/inode.c | 10 -
fs/open.c | 32 ++-
fs/pnode.c | 13 +-
fs/proc/self.c | 10 +-
fs/proc_namespace.c | 8 +-
fs/qnx4/namei.c | 4 -
fs/read_write.c | 25 +-
fs/readdir.c | 2 +-
fs/select.c | 4 +-
fs/splice.c | 6 +-
fs/stat.c | 31 ++-
fs/super.c | 201 ++++------
fs/sync.c | 2 +-
fs/ubifs/dir.c | 41 +--
fs/ubifs/journal.c | 6 +-
fs/ubifs/xattr.c | 16 +-
fs/utimes.c | 9 +-
include/asm-generic/siginfo.h | 2 +-
include/linux/anon_inodes.h | 3 -
include/linux/binfmts.h | 3 +-
include/linux/compat.h | 2 +-
include/linux/coredump.h | 10 +-
include/linux/dcache.h | 104 +++++-
include/linux/elf.h | 6 +-
include/linux/elfcore.h | 7 +-
include/linux/fs.h | 106 ++++--
include/linux/lglock.h | 10 -
include/linux/mount.h | 2 +
include/linux/namei.h | 2 +-
include/linux/pid_namespace.h | 1 +
ipc/mqueue.c | 2 +-
kernel/elfcore.c | 10 +-
kernel/pid_namespace.c | 8 +-
kernel/signal.c | 2 +-
mm/memory.c | 2 +-
mm/mmap.c | 4 +-
mm/nommu.c | 2 +-
net/9p/trans_fd.c | 4 +-
net/sunrpc/rpc_pipe.c | 12 +-
sound/core/sound.c | 22 +-
sound/sound_core.c | 17 +-
159 files changed, 2100 insertions(+), 2492 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2013-11-11 16:30 Al Viro
@ 2013-11-13 14:52 ` J. Bruce Fields
0 siblings, 0 replies; 33+ messages in thread
From: J. Bruce Fields @ 2013-11-13 14:52 UTC (permalink / raw)
To: Al Viro; +Cc: Linus Torvalds, linux-kernel, linux-fsdevel
On Mon, Nov 11, 2013 at 04:30:34PM +0000, Al Viro wrote:
> All kinds of stuff this time around; some more notable parts:
> * RCU'd vfsmounts handling
> * new primitives for coredump handling
> * files_lock is gone
> * Bruce's delegations handling series
> * exportfs fixes
Thanks. The one thing I have left for you right now is jlayton's fix
for a lease/open race--is that still on your queue someplace?
It's at
git://linux-nfs.org/~bfields/linux.git for-viro
if you need it.
(Nothing urgent, the race has been there forever, just want to make sure
it doesn't fall through the cracks.)
--b.
^ permalink raw reply [flat|nested] 33+ messages in thread
* [git pull] vfs.git
@ 2013-06-15 3:34 Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2013-06-15 3:34 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
Several fixes + obvious cleanup (you've missed a couple of
open-coded can_lookup() back then). Please, pull from
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
Shortlog:
Al Viro (2):
use can_lookup() instead of direct checks of ->i_op->lookup
snd_pcm_link(): fix a leak...
Dave Chiluk (1):
ncpfs: fix rmdir returns Device or resource busy
Oleg Nesterov (2):
fput: task_work_add() can fail if the caller has passed exit_task_work()
move exit_task_namespaces() outside of exit_notify()
Diffstat:
fs/file_table.c | 19 ++++++++++---------
fs/namei.c | 4 ++--
fs/ncpfs/dir.c | 9 ---------
kernel/exit.c | 2 +-
sound/core/pcm_native.c | 4 ++--
5 files changed, 15 insertions(+), 23 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [git pull] vfs.git
@ 2012-12-21 0:21 Al Viro
0 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2012-12-21 0:21 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
fscache fixes, ESTALE patchset, vmtruncate removal series, assorted
misc stuff. Please, pull from
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs for-linus
Shortlog:
Al Viro (1):
path_init(): make -ENOTDIR failure exits consistent
Alessio Igor Bogani (1):
vfs: Remove useless function prototypes
David Howells (23):
CacheFiles: Fix the marking of cached pages
CacheFiles: Downgrade the requirements passed to the allocator
FS-Cache: Check that there are no read ops when cookie relinquished
CacheFiles: Make some debugging statements conditional
FS-Cache: Make cookie relinquishment wait for outstanding reads
FS-Cache: Fix operation state management and accounting
FS-Cache: Provide proper invalidation
VFS: Make more complete truncate operation available to CacheFiles
CacheFiles: Implement invalidation
NFS: Use FS-Cache invalidation
CacheFiles: Add missing retrieval completions
FS-Cache: Convert the object event ID #defines into an enum
FS-Cache: Initialise the object event mask with the calculated mask
FS-Cache: Don't mask off the object event mask when printing it
FS-Cache: Limit the number of I/O error reports for a cache
FS-Cache: Exclusive op submission can BUG if there's been an I/O error
NFS: nfs_migrate_page() does not wait for FS-Cache to finish with a page
FS-Cache: Add transition to handle invalidate immediately after lookup
NFS4: Open files for fscaching
FS-Cache: Fix signal handling during waits
FS-Cache: One of the write operation paths doesn't set the object state
FS-Cache: Mark cancellation of in-progress operation
FS-Cache: Clear remaining page count on retrieval cancellation
Jan Kara (1):
fs: Fix imbalance in freeze protection in mark_files_ro()
Jeff Layton (30):
vfs: remove unneeded permission check from path_init
vfs: remove DCACHE_NEED_LOOKUP
vfs: add a retry_estale helper function to handle retries on ESTALE
vfs: make fstatat retry on ESTALE errors from getattr call
vfs: fix readlinkat to retry on ESTALE
vfs: turn is_dir argument to kern_path_create into a lookup_flags arg
vfs: fix mknodat to retry on ESTALE errors
vfs: fix mkdirat to retry once on an ESTALE error
vfs: fix symlinkat to retry on ESTALE errors
vfs: fix linkat to retry once on ESTALE errors
vfs: add a flags argument to user_path_parent
vfs: make do_rmdir retry once on ESTALE errors
vfs: make do_unlinkat retry once on ESTALE errors
vfs: fix renameat to retry on ESTALE errors
vfs: have do_sys_truncate retry once on an ESTALE error
vfs: have faccessat retry once on an ESTALE error
vfs: have chdir retry lookup and call once on ESTALE error
vfs: have chroot retry once on ESTALE error
vfs: make fchmodat retry once on ESTALE errors
vfs: make fchownat retry once on ESTALE errors
vfs: fix user_statfs to retry once on ESTALE errors
vfs: allow utimensat() calls to retry once on an ESTALE error
vfs: allow setxattr to retry once on ESTALE errors
vfs: allow lsetxattr() to retry once on ESTALE errors
vfs: make getxattr retry once on an ESTALE error
vfs: make lgetxattr retry once on ESTALE
vfs: make listxattr retry once on ESTALE error
vfs: make llistxattr retry once on ESTALE error
vfs: make removexattr retry once on ESTALE
vfs: make lremovexattr retry once on ESTALE error
Marco Stornelli (21):
ufs: drop vmtruncate
sysv: drop vmtruncate
reiserfs: drop vmtruncate
procfs: drop vmtruncate
omfs: drop vmtruncate
ocfs2: drop vmtruncate
adfs: drop vmtruncate
affs: drop vmtruncate
bfs: drop vmtruncate
hfs: drop vmtruncate
hpfs: drop vmtruncate
jfs: drop vmtruncate
hfsplus: drop vmtruncate
logfs: drop vmtruncate
minix: drop vmtruncate
ncpfs: drop vmtruncate
nilfs2: drop vmtruncate
ntfs: drop vmtruncate
vfs: drop vmtruncate
mm: drop vmtruncate
documentation: drop vmtruncate
Miao Xie (1):
vfs, freeze: use ACCESS_ONCE() to guard access to ->mnt_flags
NeilBrown (1):
vfs: d_obtain_alias() needs to use "/" as default name.
Diffstat:
Documentation/filesystems/Locking | 6 -
Documentation/filesystems/caching/backend-api.txt | 38 ++++-
Documentation/filesystems/caching/netfs-api.txt | 46 ++++-
Documentation/filesystems/caching/object.txt | 23 ++-
Documentation/filesystems/caching/operations.txt | 2 +-
Documentation/filesystems/porting | 2 +-
Documentation/filesystems/vfs.txt | 11 --
arch/powerpc/platforms/cell/spufs/syscalls.c | 2 +-
drivers/base/devtmpfs.c | 2 +-
fs/adfs/inode.c | 15 +-
fs/affs/file.c | 18 ++-
fs/affs/inode.c | 5 +-
fs/bfs/file.c | 15 +-
fs/btrfs/inode.c | 16 +--
fs/cachefiles/interface.c | 57 ++++++-
fs/cachefiles/internal.h | 2 +
fs/cachefiles/key.c | 2 +-
fs/cachefiles/namei.c | 3 +-
fs/cachefiles/rdwr.c | 114 +++++++-----
fs/cachefiles/xattr.c | 2 +-
fs/dcache.c | 35 +----
fs/file_table.c | 2 +-
fs/fscache/cache.c | 8 +-
fs/fscache/cookie.c | 78 ++++++++
fs/fscache/internal.h | 15 ++-
fs/fscache/object-list.c | 2 +-
fs/fscache/object.c | 101 ++++++++++-
fs/fscache/operation.c | 140 ++++++++++++----
fs/fscache/page.c | 195 +++++++++++++++++----
fs/fscache/stats.c | 17 ++-
fs/hfs/inode.c | 26 ++-
fs/hfsplus/inode.c | 27 ++--
fs/hpfs/file.c | 20 ++-
fs/hpfs/hpfs_fn.h | 1 +
fs/hpfs/inode.c | 5 +-
fs/jfs/file.c | 6 +-
fs/jfs/inode.c | 20 ++-
fs/libfs.c | 2 -
fs/logfs/readwrite.c | 10 +-
fs/minix/file.c | 6 +-
fs/minix/inode.c | 17 ++-
fs/namei.c | 118 +++++++++----
fs/namespace.c | 2 +-
fs/ncpfs/inode.c | 4 +-
fs/nfs/fscache.c | 1 +
fs/nfs/fscache.h | 20 ++-
fs/nfs/inode.c | 20 ++-
fs/nfs/nfs4file.c | 2 +
fs/nfs/nfs4proc.c | 3 +-
fs/nfs/write.c | 3 +-
fs/nilfs2/file.c | 1 -
fs/nilfs2/inode.c | 24 ++-
fs/nilfs2/nilfs.h | 1 +
fs/nilfs2/recovery.c | 3 +-
fs/ntfs/file.c | 16 ++-
fs/ntfs/inode.c | 8 +-
fs/ntfs/inode.h | 4 +
fs/ocfs2/file.c | 18 --
fs/omfs/file.c | 22 ++-
fs/open.c | 97 +++++++----
fs/proc/base.c | 7 -
fs/proc/generic.c | 9 +-
fs/proc/proc_sysctl.c | 7 -
fs/reiserfs/file.c | 3 +-
fs/reiserfs/inode.c | 15 ++-
fs/reiserfs/reiserfs.h | 1 +
fs/stat.c | 16 ++-
fs/statfs.c | 9 +-
fs/sysv/file.c | 5 +-
fs/sysv/itree.c | 17 ++-
fs/ufs/inode.c | 15 +-
fs/utimes.c | 6 +-
fs/xattr.c | 72 ++++++--
include/linux/dcache.h | 8 -
include/linux/fs.h | 6 +-
include/linux/fscache-cache.h | 71 ++++++--
include/linux/fscache.h | 50 +++++-
include/linux/mm.h | 1 -
include/linux/namei.h | 20 ++-
mm/truncate.c | 23 ---
80 files changed, 1311 insertions(+), 531 deletions(-)
^ permalink raw reply [flat|nested] 33+ messages in thread* [git pull] vfs.git
@ 2012-06-01 16:56 Al Viro
2012-06-01 17:38 ` Linus Torvalds
0 siblings, 1 reply; 33+ messages in thread
From: Al Viro @ 2012-06-01 16:56 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
Less than I would like to have there, but since the window is about to close...
Please, pull from
git.kernel.org:/pub/scm/linux/kernel/git/viro/vfs.git for-linus
There's a trivial conflict in Documentation/filesystems/vfs.txt - two
method prototypes added, one in mainline, one here. With the obvious
conflict resolution...
Shortlog:
Al Viro (55):
switch do_fsync() to fget_light()
switch readdir/getdents to fget_light/fput_light
switch xattr syscalls to fget_light/fput_light
switch fcntl to fget_raw_light/fput_light
switch signalfd4() to fget_light/fput_light
switch flock to fget_light/fput_light
switch statfs to fget_light/fput_light
switch utimes() to fget_light/fput_light
xfs: switch to proper __bitwise type for KM_... flags
ubifs: use generic_fillattr()
->encode_fh() API change
selinuxfs snprintf() misuses
kill v9fs_dentry_from_dir_inode()
affs: bury unused macros
ocfs2: trivial endianness misannotations
ocfs2: deal with __user misannotations
ocfs2: kill endianness abuses in blockcheck.c
btrfs: trivial endianness annotations
hpfs: endianness bugs
hpfs: get rid of bitfields endianness wanking in extended_attribute
hpfs: get rid of bitfields in struct fnode
hpfs: bitmaps are little-endian
hpfs: annotate struct dnode
hpfs: annotate btree nodes, get rid of bitfields mess
hpfs: annotate struct fnode
hpfs: annotate struct anode
hpfs: annotate struct hpfs_dirent
hpfs: annotate ea
hpfs: assorted endianness annotations
get rid of pointless allocations and copying in ecryptfs_follow_link()
ocfs: simplify symlink handling
get rid of idiotic misplaced __kernel_mode_t in ncfps kernel-private data structure
mode_t whack-a-mole: ->is_visible() returns umode_t...
mips: get rid of nlink_t, use explictly-sized type (__u32 in all cases)
powerpc: get rid of nlink_t uses, switch to explicitly-sized type
parisc: get rid of nlink_t, switch to explicitly-sized type
bury __kernel_nlink_t, make internal nlink_t consistent
i810: switch to vm_mmap()
vfs: umount_tree() might be called on subtree that had never made it
binfmt_elf: switch elf_map() to vm_mmap/vm_munmap
binfmt_flat: use vm_munmap, we are missing ->mmap_sem there
ia64, sparc64: convert wrappers around do_mremap() to sys_mremap()
merge do_mremap() into sys_mremap()
ia64 perfmon: fix get_unmapped_area() use there
unexport do_mmap()
split cap_mmap_addr() out of cap_file_mmap()
split ->file_mmap() into ->mmap_addr()/->mmap_file()
take security_mmap_file() outside of ->mmap_sem
move security_mmap_addr() to saner place
take calculation of final prot in security_mmap_file() into a helper
switch aio and shm to do_mmap_pgoff(), make do_mmap() static
kill do_mmap() completely
new helper: vm_mmap_pgoff()
unexport do_munmap()
sch_atm.c: get rid of poinless extern
Andi Kleen (2):
brlocks/lglocks: turn into functions
brlocks/lglocks: API cleanups
Artem Bityutskiy (9):
jffs2: remove lock_super
jffs2: remove unnecessary GC pass on umount
jffs2: remove unnecessary GC pass on sync
jffs2: get rid of jffs2_sync_super
reiserfs: cleanup reiserfs_fill_super a bit
reiserfs: clean-up function return type
reiserfs: remove useless superblock dirtying
reiserfs: mark the superblock as dirty a bit later
reiserfs: get rid of resierfs_sync_super
Cong Wang (1):
fs: move file_remove_suid() to fs/inode.c
Dan Carpenter (1):
fsnotify: remove unused parameter from send_to_group()
Dmitry Kasatkin (1):
vfs: increment iversion when a file is truncated
J. Bruce Fields (2):
vfs: stop d_splice_alias creating directory aliases
vfs: remove unused __d_splice_alias argument
Josef Bacik (2):
fs: introduce inode operation ->update_time
Btrfs: move over to use ->update_time
Miklos Szeredi (16):
vfs: split do_lookup()
vfs: do_last(): make exit RCU safe
vfs: do_last(): inline walk_component()
vfs: do_last(): use inode variable
vfs: make follow_link check RCU safe
vfs: do_last(): make ENOENT exit RCU safe
vfs: do_last(): check LOOKUP_DIRECTORY
vfs: do_last(): only return EISDIR for O_CREAT
vfs: do_last(): add audit_inode before open
vfs: do_last() common post lookup
vfs: split __dentry_open()
vfs: do_dentry_open(): don't put filp
vfs: nameidata_to_filp(): inline __dentry_open()
vfs: nameidata_to_filp(): don't throw away file on error
vfs: retry last component if opening stale dentry
nfs: don't open in ->d_revalidate
Naohiro Aota (1):
fsnotify: handle subfiles' perm events
Randy Dunlap (1):
fs: fix inode.c kernel-doc warnings
Rusty Russell (1):
lglock: remove online variants of lock
Sage Weil (1):
ceph: move encode_fh to new API
Shai Fultheim (1):
fs: Move bh_cachep to the __read_mostly section
Will Deacon (1):
pipe: return -ENOIOCTLCMD instead of -EINVAL on unknown ioctl command
Diffstat:
Documentation/filesystems/Locking | 3 +
Documentation/filesystems/vfs.txt | 4 +
arch/alpha/include/asm/posix_types.h | 3 -
arch/arm/include/asm/posix_types.h | 3 -
arch/avr32/include/asm/posix_types.h | 3 -
arch/blackfin/include/asm/posix_types.h | 3 -
arch/cris/include/asm/posix_types.h | 3 -
arch/frv/include/asm/posix_types.h | 3 -
arch/h8300/include/asm/posix_types.h | 3 -
arch/ia64/include/asm/posix_types.h | 3 -
arch/ia64/kernel/perfmon.c | 10 +-
arch/ia64/kernel/sys_ia64.c | 19 +--
arch/m32r/include/asm/posix_types.h | 3 -
arch/m68k/include/asm/posix_types.h | 3 -
arch/mips/include/asm/posix_types.h | 5 -
arch/mips/include/asm/stat.h | 6 +-
arch/mn10300/include/asm/posix_types.h | 3 -
arch/parisc/include/asm/posix_types.h | 3 -
arch/parisc/include/asm/stat.h | 4 +-
arch/powerpc/include/asm/posix_types.h | 3 -
arch/powerpc/include/asm/stat.h | 4 +-
arch/s390/include/asm/posix_types.h | 3 -
arch/sh/include/asm/posix_types_32.h | 2 -
arch/sh/include/asm/posix_types_64.h | 2 -
arch/sparc/include/asm/posix_types.h | 5 -
arch/sparc/kernel/sys_sparc_64.c | 11 +-
arch/tile/include/asm/compat.h | 1 -
arch/x86/include/asm/posix_types_32.h | 3 -
drivers/base/soc.c | 2 +-
drivers/gpu/drm/i810/i810_dma.c | 4 +-
fs/9p/vfs_inode_dotl.c | 24 +---
fs/affs/affs.h | 8 -
fs/aio.c | 6 +-
fs/attr.c | 5 +
fs/binfmt_elf.c | 8 +-
fs/binfmt_flat.c | 8 +-
fs/btrfs/ctree.h | 1 -
fs/btrfs/export.c | 15 +--
fs/btrfs/file.c | 2 +-
fs/btrfs/free-space-cache.c | 7 +-
fs/btrfs/inode.c | 53 ++----
fs/btrfs/ulist.c | 4 +-
fs/btrfs/ulist.h | 4 +-
fs/buffer.c | 2 +-
fs/ceph/export.c | 32 +++--
fs/compat.c | 33 ++--
fs/dcache.c | 20 +--
fs/ecryptfs/inode.c | 48 +----
fs/exec.c | 4 -
fs/exportfs/expfs.c | 33 ++--
fs/fat/inode.c | 9 +-
fs/fcntl.c | 42 ++---
fs/file_table.c | 17 +-
fs/fuse/file.c | 4 +-
fs/fuse/inode.c | 17 +--
fs/gfs2/export.c | 17 +--
fs/hpfs/alloc.c | 14 +-
fs/hpfs/anode.c | 43 +++--
fs/hpfs/dir.c | 2 +-
fs/hpfs/dnode.c | 10 +-
fs/hpfs/ea.c | 60 ++++----
fs/hpfs/hpfs.h | 289 +++++++++++++++----------------
fs/hpfs/hpfs_fn.h | 16 +-
fs/hpfs/inode.c | 2 +-
fs/hpfs/map.c | 20 +-
fs/hpfs/namei.c | 2 +-
fs/hpfs/super.c | 4 +-
fs/inode.c | 124 +++++++++++--
fs/internal.h | 3 +-
fs/isofs/export.c | 13 +-
fs/jffs2/jffs2_fs_sb.h | 4 +
fs/jffs2/os-linux.h | 7 +-
fs/jffs2/super.c | 21 ---
fs/jffs2/wbuf.c | 55 ++++++-
fs/locks.c | 5 +-
fs/namei.c | 177 ++++++++++++++------
fs/namespace.c | 142 ++++++++--------
fs/ncpfs/file.c | 6 +-
fs/ncpfs/ncp_fs_sb.h | 10 +-
fs/nfs/dir.c | 56 +------
fs/nfs/file.c | 77 ++++++++-
fs/nilfs2/namei.c | 22 +--
fs/notify/fsnotify.c | 12 +-
fs/ntfs/file.c | 4 +-
fs/ocfs2/blockcheck.c | 42 +++--
fs/ocfs2/dlm/dlmast.c | 2 +-
fs/ocfs2/dlm/dlmcommon.h | 6 +-
fs/ocfs2/dlm/dlmdomain.c | 2 +-
fs/ocfs2/export.c | 19 +--
fs/ocfs2/inode.c | 13 +-
fs/ocfs2/ioctl.c | 31 ++--
fs/ocfs2/move_extents.c | 6 +-
fs/ocfs2/namei.c | 5 +-
fs/ocfs2/symlink.c | 115 +++----------
fs/ocfs2/symlink.h | 2 +-
fs/open.c | 76 ++++++--
fs/pipe.c | 9 +-
fs/pnode.c | 4 +-
fs/proc_namespace.c | 4 +-
fs/readdir.c | 33 ++--
fs/reiserfs/inode.c | 28 ++--
fs/reiserfs/journal.c | 15 +-
fs/reiserfs/reiserfs.h | 12 +-
fs/reiserfs/resize.c | 1 -
fs/reiserfs/super.c | 74 ++++++--
fs/signalfd.c | 7 +-
fs/splice.c | 6 +-
fs/statfs.c | 5 +-
fs/sync.c | 5 +-
fs/ubifs/dir.c | 11 +-
fs/udf/namei.c | 14 +-
fs/utimes.c | 5 +-
fs/xattr.c | 20 ++-
fs/xfs/kmem.c | 10 +-
fs/xfs/kmem.h | 21 ++-
fs/xfs/xfs_export.c | 23 +--
fs/xfs/xfs_file.c | 7 +-
fs/xfs/xfs_log.c | 2 +-
fs/xfs/xfs_log_priv.h | 2 +-
fs/xfs/xfs_trans.c | 2 +-
fs/xfs/xfs_trans.h | 2 +-
include/asm-generic/posix_types.h | 4 -
include/linux/errno.h | 1 +
include/linux/exportfs.h | 4 +-
include/linux/fs.h | 10 +-
include/linux/fsnotify_backend.h | 2 +-
include/linux/lglock.h | 179 +++----------------
include/linux/mm.h | 2 +-
include/linux/security.h | 40 +++--
include/linux/types.h | 2 +-
ipc/shm.c | 7 +-
kernel/Makefile | 2 +-
kernel/lglock.c | 89 ++++++++++
mm/cleancache.c | 6 +-
mm/filemap.c | 69 +-------
mm/filemap_xip.c | 4 +-
mm/internal.h | 4 +
mm/mmap.c | 54 +-----
mm/mremap.c | 26 +---
mm/nommu.c | 35 +----
mm/shmem.c | 6 +-
mm/util.c | 30 ++++
net/sched/sch_atm.c | 2 -
security/apparmor/lsm.c | 15 +--
security/capability.c | 3 +-
security/commoncap.c | 17 +-
security/security.c | 51 +++++-
security/selinux/hooks.c | 15 +-
security/selinux/selinuxfs.c | 36 +---
security/smack/smack_lsm.c | 15 +-
150 files changed, 1499 insertions(+), 1622 deletions(-)
create mode 100644 kernel/lglock.c
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2012-06-01 16:56 Al Viro
@ 2012-06-01 17:38 ` Linus Torvalds
0 siblings, 0 replies; 33+ messages in thread
From: Linus Torvalds @ 2012-06-01 17:38 UTC (permalink / raw)
To: Al Viro; +Cc: linux-kernel, linux-fsdevel
On Fri, Jun 1, 2012 at 9:56 AM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> There's a trivial conflict in Documentation/filesystems/vfs.txt - two
> method prototypes added, one in mainline, one here. With the obvious
> conflict resolution...
Actually, it's one removed in mainline, one added by your pull.
What I'd *really* like to see is a kind of summary of what this pull
does, though. Please? That way I can make the merge messages be a
whole lot more informative.
Linus
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
@ 2012-06-01 17:38 ` Linus Torvalds
0 siblings, 0 replies; 33+ messages in thread
From: Linus Torvalds @ 2012-06-01 17:38 UTC (permalink / raw)
To: Al Viro; +Cc: linux-kernel, linux-fsdevel
On Fri, Jun 1, 2012 at 9:56 AM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> There's a trivial conflict in Documentation/filesystems/vfs.txt - two
> method prototypes added, one in mainline, one here. With the obvious
> conflict resolution...
Actually, it's one removed in mainline, one added by your pull.
What I'd *really* like to see is a kind of summary of what this pull
does, though. Please? That way I can make the merge messages be a
whole lot more informative.
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [git pull] vfs.git
2012-06-01 17:38 ` Linus Torvalds
(?)
@ 2012-06-01 17:48 ` Al Viro
-1 siblings, 0 replies; 33+ messages in thread
From: Al Viro @ 2012-06-01 17:48 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fsdevel
On Fri, Jun 01, 2012 at 10:38:53AM -0700, Linus Torvalds wrote:
> On Fri, Jun 1, 2012 at 9:56 AM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> >
> > There's a trivial conflict in Documentation/filesystems/vfs.txt - two
> > method prototypes added, one in mainline, one here. ?With the obvious
> > conflict resolution...
>
> Actually, it's one removed in mainline, one added by your pull.
>
> What I'd *really* like to see is a kind of summary of what this pull
> does, though. Please? That way I can make the merge messages be a
> whole lot more informative.
Umm... It's a lot of misc stuff, unfortunately. The obvious groups:
* Miklos' atomic_open series; kills the damn abuse of ->d_revalidate()
by NFS, which was the major stumbling block for all work in that area.
* ripping security_file_mmap() and dealing with deadlocks in the
area; sanitizing the neighborhood of vm_mmap()/vm_munmap() in general.
* ->encode_fh() switched to saner API; insane fake dentry in
mm/cleancache.c gone.
* assorted annotations in fs (endianness, __user)
* parts of Artem's ->s_dirty work (jff2 and reiserfs parts)
* ->update_time() work from Josef.
* other bits and pieces all over the place.
Normally it would've been in two or three pull requests, but signal.git
stuff had eaten a lot of time during this cycle ;-/
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2016-11-17 5:55 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-16 3:32 [git pull] vfs.git Al Viro
2016-05-16 15:43 ` Linus Torvalds
2016-05-17 6:27 ` Al Viro
2016-05-17 18:27 ` Linus Torvalds
2016-05-17 20:11 ` Al Viro
-- strict thread matches above, loose matches on Subject: below --
2016-11-17 5:55 Al Viro
2016-11-11 6:05 Al Viro
2016-11-11 17:25 ` Linus Torvalds
2016-11-11 18:06 ` Ilya Dryomov
2016-11-12 3:36 ` Yan, Zheng
2016-10-11 3:07 Al Viro
2016-03-20 1:44 Al Viro
2016-03-20 1:55 ` Linus Torvalds
2016-03-20 1:59 ` Al Viro
2015-04-24 20:40 Al Viro
2014-12-10 19:13 [GIT PULL] vfs.git Al Viro
2014-12-11 16:18 ` Miklos Szeredi
2014-12-11 18:06 ` Al Viro
2014-12-11 18:34 ` Al Viro
2014-11-05 13:57 [git pull] vfs.git Al Viro
2014-11-02 5:58 Al Viro
2014-10-26 3:04 Al Viro
2014-05-28 6:38 Al Viro
2014-04-12 12:40 Al Viro
2014-04-13 18:53 ` Geert Uytterhoeven
2013-11-11 16:30 Al Viro
2013-11-13 14:52 ` J. Bruce Fields
2013-06-15 3:34 Al Viro
2012-12-21 0:21 Al Viro
2012-06-01 16:56 Al Viro
2012-06-01 17:38 ` Linus Torvalds
2012-06-01 17:38 ` Linus Torvalds
2012-06-01 17:48 ` Al Viro
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.