lkml.org 
[lkml]   [2015]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subject[git pull] vfs.git
	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(-)


\
 
 \ /
  Last update: 2015-04-24 23:21    [W:0.045 / U:0.368 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site