From: Linus Torvalds Date: Sun, 8 Jan 2012 21:07:54 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw X-Git-Tag: firefly_0821_release~3680^2~3820 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1619ed8f60959829d070d8f39cd2f8ca0e7135ce;p=firefly-linux-kernel-4.4.55.git Merge git://git./linux/kernel/git/steve/gfs2-3.0-nmw * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw: GFS2: local functions should be static GFS2: We only need one ACL getting function GFS2: Fix multi-block allocation GFS2: decouple quota allocations from block allocations GFS2: split function rgblk_search GFS2: Fix up "off by one" in the previous patch GFS2: move toward a generic multi-block allocator GFS2: O_(D)SYNC support for fallocate GFS2: remove vestigial al_alloced GFS2: combine gfs2_alloc_block and gfs2_alloc_di GFS2: Add non-try locks back to get_local_rgrp GFS2: f_ra is always valid in dir readahead function GFS2: Fix very unlikley memory leak in ACL xattr code GFS2: More automated code analysis fixes GFS2: Add readahead to sequential directory traversal GFS2: Fix up REQ flags --- 1619ed8f60959829d070d8f39cd2f8ca0e7135ce