From: Linus Torvalds Date: Tue, 11 Jan 2011 19:42:06 +0000 (-0800) Subject: Merge branch 'for-linus-merged' of git://oss.sgi.com/xfs/xfs X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7bc4a4ce68f8c6d064ea949446852e996526f692;p=linux-beck.git Merge branch 'for-linus-merged' of git://oss.sgi.com/xfs/xfs * 'for-linus-merged' of git://oss.sgi.com/xfs/xfs: (47 commits) xfs: convert grant head manipulations to lockless algorithm xfs: introduce new locks for the log grant ticket wait queues xfs: convert log grant heads to atomic variables xfs: convert l_tail_lsn to an atomic variable. xfs: convert l_last_sync_lsn to an atomic variable xfs: make AIL tail pushing independent of the grant lock xfs: use wait queues directly for the log wait queues xfs: combine grant heads into a single 64 bit integer xfs: rework log grant space calculations xfs: fact out common grant head/log tail verification code xfs: convert log grant ticket queues to list heads xfs: use AIL bulk delete function to implement single delete xfs: use AIL bulk update function to implement single updates xfs: remove all the inodes on a buffer from the AIL in bulk xfs: consume iodone callback items on buffers as they are processed xfs: reduce the number of AIL push wakeups xfs: bulk AIL insertion during transaction commit xfs: clean up xfs_ail_delete() xfs: Pull EFI/EFD handling out from under the AIL lock xfs: fix EFI transaction cancellation. ... --- 7bc4a4ce68f8c6d064ea949446852e996526f692