Linus Torvalds 49d99a2f9c Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs ... Pull XFS updates from Ben Myers: "Scalability improvements for dquots, log grant code cleanups, plus bugfixes and cleanups large and small" Fix up various trivial conflicts that were due to some of the earlier patches already having been integrated into v3.3 as bugfixes, and then there were development patches on top of those. Easily merged by just taking the newer version from the pulled branch. * 'for-linus' of git://oss.sgi.com/xfs/xfs: (45 commits) xfs: fallback to vmalloc for large buffers in xfs_getbmap xfs: fallback to vmalloc for large buffers in xfs_attrmulti_attr_get xfs: remove remaining scraps of struct xfs_iomap xfs: fix inode lookup race xfs: clean up minor sparse warnings xfs: remove the global xfs_Gqm structure xfs: remove the per-filesystem list of dquots xfs: use per-filesystem radix trees for dquot lookup xfs: per-filesystem dquot LRU lists xfs: use common code for quota statistics xfs: reimplement fdatasync support xfs: split in-core and on-disk inode log item fields xfs: make xfs_inode_item_size idempotent xfs: log timestamp updates xfs: log file size updates at I/O completion time xfs: log file size updates as part of unwritten extent conversion xfs: do not require an ioend for new EOF calculation xfs: use per-filesystem I/O completion workqueues quota: make Q_XQUOTASYNC a noop xfs: include reservations in quota reporting ...		2012-03-23 09:19:22 -07:00
..
Kconfig	quota: Make QUOTACTL config be selected by its users	2010-10-05 12:16:37 +02:00
kmem.c	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
kmem.h	xfs: use a normal shrinker for the dquot freelist	2012-02-10 12:38:09 -06:00
Makefile	xfs: use common code for quota statistics	2012-03-14 11:09:06 -05:00
mrlock.h	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
time.h	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
uuid.c	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
uuid.h	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_acl.c	xfs: fix acl count validation in xfs_acl_from_disk()	2011-12-16 15:17:42 -06:00
xfs_acl.h	xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set	2011-08-01 02:35:04 -04:00
xfs_ag.h	xfs: Remove the macro XFS_BUF_PTR	2011-07-25 15:03:13 -05:00
xfs_alloc_btree.c	xfs: remove leftovers of the old btree tracing code	2011-07-13 13:43:50 +02:00
xfs_alloc_btree.h
xfs_alloc.c	xfs: remove XFS_BUF_SET_VTYPE and XFS_BUF_SET_VTYPE_REF	2011-10-11 21:15:09 -05:00
xfs_alloc.h	xfs: do not discard alloc btree blocks	2011-05-24 11:17:22 -05:00
xfs_aops.c	xfs: log file size updates at I/O completion time	2012-03-13 16:30:49 -05:00
xfs_aops.h	xfs: log file size updates at I/O completion time	2012-03-13 16:30:49 -05:00
xfs_attr_leaf.c	xfs: remove the if_ext_max field in struct xfs_ifork	2012-01-17 15:02:28 -06:00
xfs_attr_leaf.h
xfs_attr_sf.h
xfs_attr.c	xfs: remove xfs_itruncate_data	2012-01-13 12:11:45 -06:00
xfs_attr.h
xfs_bit.c
xfs_bit.h
xfs_bmap_btree.c	xfs: remove leftovers of the old btree tracing code	2011-07-13 13:43:50 +02:00
xfs_bmap_btree.h
xfs_bmap.c	xfs: fallback to vmalloc for large buffers in xfs_getbmap	2012-03-15 14:54:23 -05:00
xfs_bmap.h	xfs: cleanup xfs_bmap.h	2011-10-11 21:15:07 -05:00
xfs_btree.c	xfs: remove XFS_BUF_SET_VTYPE and XFS_BUF_SET_VTYPE_REF	2011-10-11 21:15:09 -05:00
xfs_btree.h	xfs: Remove the macro XFS_BUF_PTR	2011-07-25 15:03:13 -05:00
xfs_buf_item.c	xfs: constify xfs_item_ops	2011-11-08 10:48:23 -06:00
xfs_buf_item.h	xfs: use struct list_head for the buf cancel table	2010-12-16 16:05:22 -06:00
xfs_buf.c	xfs: use per-filesystem I/O completion workqueues	2012-03-05 11:07:42 -06:00
xfs_buf.h	xfs: remove unused XBT_FORCE_SLEEP bit	2011-12-16 15:12:33 -06:00
xfs_da_btree.c	xfs: remove XFS_BUF_SET_VTYPE and XFS_BUF_SET_VTYPE_REF	2011-10-11 21:15:09 -05:00
xfs_da_btree.h	xfs: remove the dead XFS_DABUF_DEBUG code	2011-07-13 13:43:50 +02:00
xfs_dfrag.c	xfs: split in-core and on-disk inode log item fields	2012-03-13 17:08:17 -05:00
xfs_dfrag.h
xfs_dinode.h	xfs: Remove the macro XFS_BUF_PTR	2011-07-25 15:03:13 -05:00
xfs_dir2_block.c	xfs: clean up minor sparse warnings	2012-03-14 13:21:17 -05:00
xfs_dir2_data.c	xfs: reshuffle dir2 headers	2011-07-13 13:43:48 +02:00
xfs_dir2_format.h	xfs: cleanup struct xfs_dir2_free	2011-07-13 13:43:48 +02:00
xfs_dir2_leaf.c	xfs: introduce xfs_bmapi_read()	2011-10-11 21:15:03 -05:00
xfs_dir2_node.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
xfs_dir2_priv.h	xfs: reshuffle dir2 headers	2011-07-13 13:43:48 +02:00
xfs_dir2_sf.c	xfs: reshuffle dir2 headers	2011-07-13 13:43:48 +02:00
xfs_dir2.c	xfs: get rid of open-coded S_ISREG(), etc.	2011-07-26 15:05:16 -04:00
xfs_dir2.h	xfs: reshuffle dir2 headers	2011-07-13 13:43:48 +02:00
xfs_discard.c	xfs: fix endian conversion issue in discard code	2012-01-03 11:39:55 -06:00
xfs_discard.h	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_dquot_item.c	xfs: cleanup dquot locking helpers	2011-12-12 17:28:20 -06:00
xfs_dquot_item.h	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_dquot.c	xfs: remove the global xfs_Gqm structure	2012-03-14 12:06:32 -05:00
xfs_dquot.h	xfs: remove the per-filesystem list of dquots	2012-03-14 11:53:34 -05:00
xfs_error.c	xfs: Convert remaining cmn_err() callers to new API	2011-03-07 10:08:35 +11:00
xfs_error.h	xfs: kill support/debug.[ch]	2011-03-07 10:09:35 +11:00
xfs_export.c	xfs: fix nfs export of 64-bit inodes numbers on 32-bit kernels	2011-12-06 10:46:23 -06:00
xfs_export.h	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_extfree_item.c	xfs: constify xfs_item_ops	2011-11-08 10:48:23 -06:00
xfs_extfree_item.h	xfs: Pull EFI/EFD handling out from under the AIL lock	2010-12-20 11:59:49 +11:00
xfs_file.c	xfs: reimplement fdatasync support	2012-03-13 17:18:14 -05:00
xfs_filestream.c	xfs: rename allocation range fields in struct xfs_bmalloca	2011-10-11 21:15:06 -05:00
xfs_filestream.h
xfs_fs_subr.c	xfs: remove the i_size field in struct xfs_inode	2012-01-17 15:08:53 -06:00
xfs_fs.h	xfs: consolidate & clarify mount sanity checks	2011-07-08 11:32:51 -05:00
xfs_fsops.c	xfs: Check the return value of xfs_buf_get()	2011-10-11 21:15:01 -05:00
xfs_fsops.h	xfs: ensure log covering transactions are synchronous	2011-01-11 20:28:17 -06:00
xfs_globals.c	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_ialloc_btree.c	xfs: remove leftovers of the old btree tracing code	2011-07-13 13:43:50 +02:00
xfs_ialloc_btree.h
xfs_ialloc.c	xfs: propagate umode_t	2012-01-03 22:55:00 -05:00
xfs_ialloc.h	xfs: propagate umode_t	2012-01-03 22:55:00 -05:00
xfs_iget.c	xfs: fix inode lookup race	2012-03-15 13:16:42 -05:00
xfs_inode_item.c	xfs: reimplement fdatasync support	2012-03-13 17:18:14 -05:00
xfs_inode_item.h	xfs: reimplement fdatasync support	2012-03-13 17:18:14 -05:00
xfs_inode.c	xfs: split in-core and on-disk inode log item fields	2012-03-13 17:08:17 -05:00
xfs_inode.h	xfs: log timestamp updates	2012-03-13 17:01:15 -05:00
xfs_inum.h	xfs: cleanup shortform directory inode number handling	2011-07-08 14:35:03 +02:00
xfs_ioctl32.c	xfs: clean up minor sparse warnings	2012-03-14 13:21:17 -05:00
xfs_ioctl32.h	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_ioctl.c	xfs: fallback to vmalloc for large buffers in xfs_attrmulti_attr_get	2012-03-15 14:14:33 -05:00
xfs_ioctl.h	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_iomap.c	xfs: log file size updates as part of unwritten extent conversion	2012-03-05 11:53:16 -06:00
xfs_iomap.h	xfs: kill xfs_iomap	2010-12-16 16:05:51 -06:00
xfs_iops.c	xfs: clean up minor sparse warnings	2012-03-14 13:21:17 -05:00
xfs_iops.h	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_itable.c	xfs: log timestamp updates	2012-03-13 17:01:15 -05:00
xfs_itable.h
xfs_linux.h	xfs: revert to using a kthread for AIL pushing	2011-10-11 11:02:49 -05:00
xfs_log_cil.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
xfs_log_priv.h	xfs: split and cleanup xfs_log_reserve	2012-02-22 22:37:04 -06:00
xfs_log_recover.c	xfs: add the xlog_grant_head structure	2012-02-22 22:19:53 -06:00
xfs_log_recover.h
xfs_log.c	xfs: split and cleanup xfs_log_reserve	2012-02-22 22:37:04 -06:00
xfs_log.h	xfs: split and cleanup xfs_log_reserve	2012-02-22 22:37:04 -06:00
xfs_message.c	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_message.h	treewide: use __printf not __attribute__((format(printf,...)))	2011-10-31 17:30:54 -07:00
xfs_mount.c	Change xfs_sb_from_disk() interface to take a mount pointer	2012-02-03 11:21:33 -06:00
xfs_mount.h	xfs: use per-filesystem I/O completion workqueues	2012-03-05 11:07:42 -06:00
xfs_mru_cache.c	xfs: convert to alloc_workqueue()	2011-02-01 11:42:43 +01:00
xfs_mru_cache.h
xfs_qm_bhv.c	xfs: remove the global xfs_Gqm structure	2012-03-14 12:06:32 -05:00
xfs_qm_syscalls.c	xfs: remove the per-filesystem list of dquots	2012-03-14 11:53:34 -05:00
xfs_qm.c	xfs: remove the global xfs_Gqm structure	2012-03-14 12:06:32 -05:00
xfs_qm.h	xfs: remove the global xfs_Gqm structure	2012-03-14 12:06:32 -05:00
xfs_quota_priv.h	xfs: use per-filesystem radix trees for dquot lookup	2012-03-14 11:09:06 -05:00
xfs_quota.h	Define new macro XFS_ALL_QUOTA_ACTIVE and simply some usage	2012-02-03 11:32:20 -06:00
xfs_quotaops.c	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_rename.c	vfs: check i_nlink limits in vfs_{mkdir,rename_dir,link}	2012-03-20 21:29:32 -04:00
xfs_rtalloc.c	xfs: simplify xfs_trans_ijoin* again	2011-10-11 21:15:08 -05:00
xfs_rtalloc.h	xfs: Remove the macro XFS_BUF_PTR	2011-07-25 15:03:13 -05:00
xfs_rw.c	xfs: clean up xfs_ioerror_alert	2011-10-11 21:15:10 -05:00
xfs_rw.h	xfs: clean up xfs_ioerror_alert	2011-10-11 21:15:10 -05:00
xfs_sb.h	xfs: kill the unused XFS_BB_FSB_OFFSET macro	2012-02-02 17:08:04 -06:00
xfs_stats.c	xfs: use common code for quota statistics	2012-03-14 11:09:06 -05:00
xfs_stats.h	xfs: use common code for quota statistics	2012-03-14 11:09:06 -05:00
xfs_super.c	Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs	2012-03-23 09:19:22 -07:00
xfs_super.h	xfs: remove the global xfs_Gqm structure	2012-03-14 12:06:32 -05:00
xfs_sync.c	xfs: log timestamp updates	2012-03-13 17:01:15 -05:00
xfs_sync.h	xfs: log timestamp updates	2012-03-13 17:01:15 -05:00
xfs_sysctl.c	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_sysctl.h	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_trace.c	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs_trace.h	xfs: use per-filesystem radix trees for dquot lookup	2012-03-14 11:09:06 -05:00
xfs_trans_ail.c	xfs: cleanup xfs_log_space_wake	2012-02-22 22:17:00 -06:00
xfs_trans_buf.c	xfs: remove xfs_trans_unlocked_item	2012-02-22 22:17:00 -06:00
xfs_trans_dquot.c	xfs: remove the global xfs_Gqm structure	2012-03-14 12:06:32 -05:00
xfs_trans_extfree.c	xfs: Pull EFI/EFD handling out from under the AIL lock	2010-12-20 11:59:49 +11:00
xfs_trans_inode.c	xfs: split in-core and on-disk inode log item fields	2012-03-13 17:08:17 -05:00
xfs_trans_priv.h	xfs: remove xfs_trans_unlocked_item	2012-02-22 22:17:00 -06:00
xfs_trans_space.h
xfs_trans.c	xfs: split and cleanup xfs_log_reserve	2012-02-22 22:37:04 -06:00
xfs_trans.h	xfs: remove the lid_size field in struct log_item_desc	2011-12-08 13:53:30 -06:00
xfs_types.h	xfs: exact busy extent tracking	2011-04-28 13:18:04 -05:00
xfs_utils.c	vfs: check i_nlink limits in vfs_{mkdir,rename_dir,link}	2012-03-20 21:29:32 -04:00
xfs_utils.h	xfs: propagate umode_t	2012-01-03 22:55:00 -05:00
xfs_vnode.h	xfs: remove remaining scraps of struct xfs_iomap	2012-03-15 13:40:16 -05:00
xfs_vnodeops.c	vfs: check i_nlink limits in vfs_{mkdir,rename_dir,link}	2012-03-20 21:29:32 -04:00
xfs_vnodeops.h	xfs: remove remaining scraps of struct xfs_iomap	2012-03-15 13:40:16 -05:00
xfs_xattr.c	xfs: remove subdirectories	2011-08-12 16:21:35 -05:00
xfs.h	xfs: don't expect xfs headers to be in subdirectories	2011-08-12 13:57:55 -05:00