linux-stable-rt/fs/xfs
Lachlan McIlroy 0a8c5395f9 [XFS] Fix merge failures
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/xfs/linux-2.6/xfs_cred.h
	fs/xfs/linux-2.6/xfs_globals.h
	fs/xfs/linux-2.6/xfs_ioctl.c
	fs/xfs/xfs_vnodeops.h

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
2008-12-29 16:47:18 +11:00
..
linux-2.6 [XFS] Fix merge failures 2008-12-29 16:47:18 +11:00
quota no explicit xfs_iflush for special inodes during unmount 2008-12-04 15:39:23 +11:00
support [XFS] avoid memory allocations in xfs_fs_vcmn_err 2008-12-22 18:02:01 +11:00
Kconfig
Makefile move inode tracing out of xfs_vnode. 2008-12-04 15:39:25 +11:00
xfs.h
xfs_acl.c
xfs_acl.h
xfs_ag.h
xfs_alloc.c
xfs_alloc.h
xfs_alloc_btree.c
xfs_alloc_btree.h
xfs_arch.h
xfs_attr.c
xfs_attr.h
xfs_attr_leaf.c
xfs_attr_leaf.h
xfs_attr_sf.h
xfs_bit.c
xfs_bit.h
xfs_bmap.c
xfs_bmap.h
xfs_bmap_btree.c [XFS] handle unaligned data in xfs_bmbt_disk_get_all 2008-12-23 11:54:46 +11:00
xfs_bmap_btree.h
xfs_btree.c
xfs_btree.h
xfs_btree_trace.c
xfs_btree_trace.h
xfs_buf_item.c [XFS] Remove XFS_BUF_SHUT() and friends 2008-12-22 17:52:58 +11:00
xfs_buf_item.h
xfs_da_btree.c
xfs_da_btree.h
xfs_dfrag.c [XFS] Move copy_from_user calls out of ioctl helpers into ioctl switch. 2008-12-02 17:08:01 +11:00
xfs_dfrag.h [XFS] Move copy_from_user calls out of ioctl helpers into ioctl switch. 2008-12-02 17:08:01 +11:00
xfs_dinode.h [XFS] kill XFS_DINODE_VERSION_ defines 2008-12-01 11:37:42 +11:00
xfs_dir2.c
xfs_dir2.h
xfs_dir2_block.c
xfs_dir2_block.h
xfs_dir2_data.c
xfs_dir2_data.h
xfs_dir2_leaf.c
xfs_dir2_leaf.h
xfs_dir2_node.c
xfs_dir2_node.h
xfs_dir2_sf.c
xfs_dir2_sf.h [XFS] kill xfs_dinode_core_t 2008-12-01 11:37:35 +11:00
xfs_dir2_trace.c
xfs_dir2_trace.h
xfs_dmapi.h
xfs_dmops.c
xfs_error.c [XFS] avoid memory allocations in xfs_fs_vcmn_err 2008-12-22 18:02:01 +11:00
xfs_error.h [XFS] avoid memory allocations in xfs_fs_vcmn_err 2008-12-22 18:02:01 +11:00
xfs_extfree_item.c
xfs_extfree_item.h
xfs_filestream.c
xfs_filestream.h
xfs_fs.h [XFS] Move compat ioctl structs & numbers into xfs_ioctl32.h 2008-12-02 17:08:44 +11:00
xfs_fsops.c [XFS] Move copy_from_user calls out of ioctl helpers into ioctl switch. 2008-12-02 17:08:01 +11:00
xfs_fsops.h
xfs_ialloc.c [XFS] kill the XFS_IMAP_BULKSTAT flag 2008-12-01 11:38:13 +11:00
xfs_ialloc.h [XFS] merge xfs_imap into xfs_dilocate 2008-12-01 11:38:03 +11:00
xfs_ialloc_btree.c
xfs_ialloc_btree.h
xfs_iget.c move inode tracing out of xfs_vnode. 2008-12-04 15:39:25 +11:00
xfs_inode.c [XFS] Remove XFS_BUF_SHUT() and friends 2008-12-22 17:52:58 +11:00
xfs_inode.h [XFS] Fix merge failures 2008-12-29 16:47:18 +11:00
xfs_inode_item.c [XFS] embededd struct xfs_imap into xfs_inode 2008-12-01 11:38:08 +11:00
xfs_inode_item.h
xfs_inum.h
xfs_iomap.c [XFS] Fix speculative allocation beyond eof 2008-12-22 17:56:49 +11:00
xfs_iomap.h
xfs_itable.c [XFS] Fix xfs_bulkstat_one size checks & error handling 2008-12-02 17:16:03 +11:00
xfs_itable.h [XFS] Fix xfs_bulkstat_one size checks & error handling 2008-12-02 17:16:03 +11:00
xfs_log.c reduce l_icloglock roundtrips 2008-12-04 15:39:21 +11:00
xfs_log.h
xfs_log_priv.h
xfs_log_recover.c [XFS] replace b_fspriv with b_mount 2008-12-11 13:13:33 +11:00
xfs_log_recover.h
xfs_mount.c kill xfs_unmount_flush 2008-12-04 15:39:24 +11:00
xfs_mount.h [XFS] resync headers with libxfs 2008-12-11 13:14:17 +11:00
xfs_mru_cache.c
xfs_mru_cache.h
xfs_qmops.c
xfs_quota.h kill dead quota flags 2008-12-04 15:39:22 +11:00
xfs_refcache.h
xfs_rename.c [XFS] simplify projid check in xfs_rename 2008-12-11 13:13:52 +11:00
xfs_rtalloc.c [XFS] Move copy_from_user calls out of ioctl helpers into ioctl switch. 2008-12-02 17:08:01 +11:00
xfs_rtalloc.h
xfs_rw.c [XFS] replace b_fspriv with b_mount 2008-12-11 13:13:33 +11:00
xfs_rw.h
xfs_sb.h [XFS] resync headers with libxfs 2008-12-11 13:14:17 +11:00
xfs_trans.c
xfs_trans.h
xfs_trans_ail.c
xfs_trans_buf.c
xfs_trans_extfree.c
xfs_trans_inode.c use xfs_trans_ijoin in xfs_trans_iget 2008-12-04 15:39:23 +11:00
xfs_trans_item.c
xfs_trans_priv.h
xfs_trans_space.h
xfs_types.h
xfs_utils.c [XFS] kill XFS_DINODE_VERSION_ defines 2008-12-01 11:37:42 +11:00
xfs_utils.h
xfs_vnodeops.c [XFS] use inode_change_ok for setattr permission checking 2008-12-11 13:15:10 +11:00
xfs_vnodeops.h [XFS] Fix merge failures 2008-12-29 16:47:18 +11:00