From: Linus Torvalds Date: Fri, 8 Feb 2008 03:12:12 +0000 (-0800) Subject: Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 X-Git-Tag: v2.6.25-rc1~282 X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=0b61a2ba5dfd1620731e717d686e6ade657fd975;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 * 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: (62 commits) [XFS] add __init/__exit mark to specific init/cleanup functions [XFS] Fix oops in xfs_file_readdir() [XFS] kill xfs_root [XFS] keep i_nlink updated and use proper accessors [XFS] stop updating inode->i_blocks [XFS] Make xfs_ail_check check less by default [XFS] Move AIL pushing into it's own thread [XFS] use generic_permission [XFS] stop re-checking permissions in xfs_swapext [XFS] clean up xfs_swapext [XFS] remove permission check from xfs_change_file_space [XFS] prevent panic during log recovery due to bogus op_hdr length [XFS] Cleanup various fid related bits: [XFS] Fix xfs_lowbit64 [XFS] Remove CFORK macros and use code directly in IFORK and DFORK macros. [XFS] kill superflous buffer locking (2nd attempt) [XFS] Use kernel-supplied "roundup_pow_of_two" for simplicity [XFS] Remove the BPCSHIFT and NB* based macros from XFS. [XFS] Remove bogus assert [XFS] optimize XFS_IS_REALTIME_INODE w/o realtime config ... --- 0b61a2ba5dfd1620731e717d686e6ade657fd975