Merge tag 'xfs-for-linus-v3.12-rc1' of git://oss.sgi.com/xfs/xfs

Linux Kernel / Linux Kernel - Linus Torvalds [linux-foundation.org] - 9 September 2013 13:19 EDT

300893b Merge tag 'xfs-for-linus-v3.12-rc1' of git://oss.sgi.com/xfs/xfs

arch/powerpc/platforms/cell/spufs/inode.c | 8 +-
fs/quota/quota.c | 29 +
fs/xfs/Makefile | 20 +-
fs/xfs/xfs_acl.c | 24 +-
fs/xfs/xfs_ag.h | 53 -
fs/xfs/xfs_alloc.c | 6 +-
fs/xfs/xfs_aops.c | 23 +-
fs/xfs/xfs_attr.c | 427 +---
fs/xfs/xfs_attr.h | 9 +
fs/xfs/xfs_attr_inactive.c | 453 ++++
fs/xfs/xfs_attr_leaf.c | 657 +----
fs/xfs/xfs_attr_leaf.h | 2 +
fs/xfs/xfs_attr_list.c | 655 +++++
fs/xfs/xfs_attr_remote.c | 18 +-
fs/xfs/xfs_bmap.c | 823 +------
fs/xfs/xfs_bmap.h | 56 +-
fs/xfs/xfs_bmap_btree.c | 6 +-
fs/xfs/xfs_bmap_util.c | 2026 +++++++++++++++
fs/xfs/xfs_bmap_util.h | 110 +
fs/xfs/xfs_btree.c | 7 +-
fs/xfs/xfs_btree.h | 2 -
fs/xfs/xfs_buf.c | 5 +-
fs/xfs/xfs_buf_item.c | 58 +-
fs/xfs/xfs_buf_item.h | 100 +-
fs/xfs/xfs_da_btree.c | 8 +-
fs/xfs/xfs_da_btree.h | 12 +-
fs/xfs/xfs_dfrag.c | 459 ----
fs/xfs/xfs_dfrag.h | 53 -
fs/xfs/xfs_dir2.c | 58 +-
fs/xfs/xfs_dir2.h | 46 +
fs/xfs/xfs_dir2_block.c | 122 +-
fs/xfs/xfs_dir2_data.c | 25 +-
fs/xfs/xfs_dir2_format.h | 186 +-
fs/xfs/xfs_dir2_leaf.c | 404 +--
fs/xfs/xfs_dir2_node.c | 14 +-
fs/xfs/xfs_dir2_priv.h | 49 +-
fs/xfs/xfs_dir2_readdir.c | 695 ++++++
fs/xfs/xfs_dir2_sf.c | 240 +-
fs/xfs/xfs_discard.c | 5 +-
fs/xfs/xfs_dquot.c | 8 +-
fs/xfs/xfs_dquot_item.c | 23 +-
fs/xfs/xfs_error.c | 1 -
fs/xfs/xfs_export.c | 5 +-
fs/xfs/xfs_extent_busy.c | 2 +-
fs/xfs/xfs_extfree_item.c | 50 +-
fs/xfs/xfs_extfree_item.h | 88 +-
fs/xfs/xfs_file.c | 3 +-
fs/xfs/xfs_filestream.c | 8 +-
fs/xfs/xfs_filestream.h | 4 -
fs/xfs/xfs_format.h | 169 ++
fs/xfs/xfs_fs.h | 38 +-
fs/xfs/xfs_fsops.c | 8 +-
fs/xfs/xfs_ialloc.c | 7 +-
fs/xfs/xfs_icache.c | 15 +-
fs/xfs/xfs_icache.h | 50 +
fs/xfs/xfs_icreate_item.c | 21 +-
fs/xfs/xfs_icreate_item.h | 18 -
fs/xfs/xfs_inode.c | 3833 ++++++++++++-----------------
fs/xfs/xfs_inode.h | 312 +--
fs/xfs/xfs_inode_buf.c | 483 ++++
fs/xfs/xfs_inode_buf.h | 53 +
fs/xfs/xfs_inode_fork.c | 1920 +++++++++++++++
fs/xfs/xfs_inode_fork.h | 171 ++
fs/xfs/xfs_inode_item.c | 53 +-
fs/xfs/xfs_inode_item.h | 115 +-
fs/xfs/xfs_ioctl.c | 148 +-
fs/xfs/xfs_ioctl.h | 10 +
fs/xfs/xfs_ioctl32.c | 4 +-
fs/xfs/xfs_iomap.c | 21 +-
fs/xfs/xfs_iops.c | 78 +-
fs/xfs/xfs_iops.h | 13 +
fs/xfs/xfs_linux.h | 60 +-
fs/xfs/xfs_log.c | 113 +-
fs/xfs/xfs_log.h | 90 +-
fs/xfs/xfs_log_cil.c | 371 +--
fs/xfs/xfs_log_format.h | 852 +++++++
fs/xfs/xfs_log_priv.h | 155 +-
fs/xfs/xfs_log_recover.c | 407 ++-
fs/xfs/xfs_log_rlimit.c | 147 ++
fs/xfs/xfs_mount.c | 755 +-----
fs/xfs/xfs_mount.h | 113 +-
fs/xfs/xfs_qm.c | 95 +-
fs/xfs/xfs_qm.h | 2 +
fs/xfs/xfs_qm_bhv.c | 1 +
fs/xfs/xfs_qm_syscalls.c | 126 +-
fs/xfs/xfs_quota.h | 278 +--
fs/xfs/xfs_quota_defs.h | 157 ++
fs/xfs/xfs_quotaops.c | 17 +-
fs/xfs/xfs_rename.c | 346 ---
fs/xfs/xfs_rtalloc.c | 28 +-
fs/xfs/xfs_rtalloc.h | 53 +-
fs/xfs/xfs_sb.c | 834 +++++++
fs/xfs/xfs_sb.h | 72 +-
fs/xfs/xfs_super.c | 31 +-
fs/xfs/xfs_symlink.c | 196 +-
fs/xfs/xfs_symlink.h | 41 +-
fs/xfs/xfs_symlink_remote.c | 200 ++
fs/xfs/xfs_trace.c | 1 +
fs/xfs/xfs_trans.c | 732 +-----
fs/xfs/xfs_trans.h | 301 +--
fs/xfs/xfs_trans_ail.c | 18 +-
fs/xfs/xfs_trans_buf.c | 2 +-
fs/xfs/xfs_trans_dquot.c | 1 +
fs/xfs/xfs_trans_priv.h | 15 +
fs/xfs/xfs_trans_resv.c | 803 ++++++
fs/xfs/xfs_trans_resv.h | 116 +
fs/xfs/xfs_types.h | 60 +-
fs/xfs/xfs_utils.c | 314 ---
fs/xfs/xfs_utils.h | 27 -
fs/xfs/xfs_vnodeops.c | 1870 --------------
fs/xfs/xfs_vnodeops.h | 55 -
fs/xfs/xfs_xattr.c | 2 +-
include/linux/quota.h | 1 +
include/uapi/linux/dqblk_xfs.h | 47 +
init/Kconfig | 13 -
kernel/capability.c | 1 +
116 files changed, 13653 insertions(+), 11951 deletions(-)

Upstream: git.kernel.org


  • Share