[XFS updates] XFS development tree branch, master, updated. v2.6.38-18957-g59c5f46
xfs at oss.sgi.com
xfs at oss.sgi.com
Tue Jun 7 14:38:12 CDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "XFS development tree".
The branch, master has been updated
aa38572 fs: pass exact type of data dirties to ->dirty_inode
8a0599d Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
1495f23 vmscan: change shrinker API by passing shrink_control struct
a77febb Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
57d19e8 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
70f23fd treewide: fix a few typos in comments
7ac9565 xfs: fix race condition in AIL push trigger
fe0da76 xfs: make AIL target updates and compares 32bit safe.
50e8668 xfs: always push the AIL to the target
9e7004e xfs: exit AIL push work correctly when AIL is empty
228d62d xfs: ensure reclaim cursor is reset correctly at end of AG
from 233eebb9a96f956c541c0c9094fd321894bd93a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit aa38572954ade525817fe88c54faebf85e5a61c0
Author: Christoph Hellwig <hch at infradead.org>
Date: Fri May 27 06:53:02 2011 -0400
fs: pass exact type of data dirties to ->dirty_inode
Tell the filesystem if we just updated timestamp (I_DIRTY_SYNC) or
anything else, so that the filesystem can track internally if it
needs to push out a transaction for fdatasync or not.
This is just the prototype change with no user for it yet. I plan
to push large XFS changes for the next merge window, and getting
this trivial infrastructure in this window would help a lot to avoid
tree interdependencies.
Also remove incorrect comments that ->dirty_inode can't block. That
has been changed a long time ago, and many implementations rely on it.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 8a0599dd2471f2a2e409498c08a0ab339057ad06
Merge: 35806b4f7c5620b547f183e9d53f7cfaeabb582b 233eebb9a96f956c541c0c9094fd321894bd93a7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 26 10:49:11 2011 -0700
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: correctly decrement the extent buffer index in xfs_bmap_del_extent
xfs: check for valid indices in xfs_iext_get_ext and xfs_iext_idx_to_irec
xfs: fix up asserts in xfs_iflush_fork
xfs: do not do pointer arithmetic on extent records
xfs: do not use unchecked extent indices in xfs_bunmapi
xfs: do not use unchecked extent indices in xfs_bmapi
xfs: do not use unchecked extent indices in xfs_bmap_add_extent_*
xfs: remove if_lastex
xfs: remove the unused XFS_BMAPI_RSVBLOCKS flag
xfs: do not discard alloc btree blocks
xfs: add online discard support
commit 1495f230fa7750479c79e3656286b9183d662077
Author: Ying Han <yinghan at google.com>
Date: Tue May 24 17:12:27 2011 -0700
vmscan: change shrinker API by passing shrink_control struct
Change each shrinker's API by consolidating the existing parameters into
shrink_control struct. This will simplify any further features added w/o
touching each file of shrinker.
[akpm at linux-foundation.org: fix build]
[akpm at linux-foundation.org: fix warning]
[kosaki.motohiro at jp.fujitsu.com: fix up new shrinker API]
[akpm at linux-foundation.org: fix xfs warning]
[akpm at linux-foundation.org: update gfs2]
Signed-off-by: Ying Han <yinghan at google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Minchan Kim <minchan.kim at gmail.com>
Acked-by: Pavel Emelyanov <xemul at openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Mel Gorman <mel at csn.ul.ie>
Acked-by: Rik van Riel <riel at redhat.com>
Cc: Johannes Weiner <hannes at cmpxchg.org>
Cc: Hugh Dickins <hughd at google.com>
Cc: Dave Hansen <dave at linux.vnet.ibm.com>
Cc: Steven Whitehouse <swhiteho at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a77febbef105554c5a37241cf903f48ab7bc03c7
Merge: 42cd71bf1e3a081b3150018bbf448cb6c8a844a5 bf59170a66bc3eaf3ee513aa6ce9774aa2ab5188
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 23 15:19:16 2011 -0700
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: obey minleft values during extent allocation correctly
xfs: reset buffer pointers before freeing them
xfs: avoid getting stuck during async inode flushes
xfs: fix xfs_itruncate_start tracing
xfs: fix duplicate workqueue initialisation
xfs: kill off xfs_printk()
xfs: fix race condition in AIL push trigger
xfs: make AIL target updates and compares 32bit safe.
xfs: always push the AIL to the target
xfs: exit AIL push work correctly when AIL is empty
xfs: ensure reclaim cursor is reset correctly at end of AG
xfs: add an x86 compat handler for XFS_IOC_ZERO_RANGE
xfs: fix compiler warning in xfs_trace.h
xfs: cleanup duplicate initializations
xfs: reduce the number of pagb_lock roundtrips in xfs_alloc_clear_busy
xfs: exact busy extent tracking
xfs: do not immediately reuse busy extent ranges
xfs: optimize AGFL refills
commit 57d19e80f459dd845fb3cfeba8e6df8471bac142
Merge: ee9ec4f82049c678373a611ce20ac67fe9ad836e e64851f5a0ad6ec991f74ebb3108c35aa0323d5f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 23 09:12:26 2011 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
commit 70f23fd66bc821a0e99647f70a809e277cc93c4c
Author: Justin P. Mattock <justinmattock at gmail.com>
Date: Tue May 10 10:16:21 2011 +0200
treewide: fix a few typos in comments
- kenrel -> kernel
- whetehr -> whether
- ttt -> tt
- sss -> ss
Signed-off-by: Justin P. Mattock <justinmattock at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 7ac956576d0ce8f97450a39c2f304db8eea01647
Author: Dave Chinner <dchinner at redhat.com>
Date: Fri May 6 02:54:08 2011 +0000
xfs: fix race condition in AIL push trigger
The recent conversion of the xfsaild functionality to a work queue
introduced a hard-to-hit log space grant hang. One is caused by a
race condition in determining whether there is a psh in progress or
not.
The XFS_AIL_PUSHING_BIT is used to determine whether a push is
currently in progress. When the AIL push work completes, it checked
whether the target changed and cleared the PUSHING bit to allow a
new push to be requeued. The race condition is as follows:
Thread 1 push work
smp_wmb()
smp_rmb()
check ailp->xa_target unchanged
update ailp->xa_target
test/set PUSHING bit
does not queue
clear PUSHING bit
does not requeue
Now that the push target is updated, new attempts to push the AIL
will not trigger as the push target will be the same, and hence
despite trying to push the AIL we won't ever wake it again.
The fix is to ensure that the AIL push work clears the PUSHING bit
before it checks if the target is unchanged.
As a result, both push triggers operate on the same test/set bit
criteria, so even if we race in the push work and miss the target
update, the thread requesting the push will still set the PUSHING
bit and queue the push work to occur. For safety sake, the same
queue check is done if the push work detects the target change,
though only one of the two will will queue new work due to the use
of test_and_set_bit() checks.
Signed-off-by: Dave Chinner <dchinner at redhat.com>
Reviewed-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Alex Elder <aelder at sgi.com>
(cherry picked from commit e4d3c4a43b595d5124ae824d300626e6489ae857)
commit fe0da767311933d1c1907cb8d326beea7a3cbd9c
Author: Dave Chinner <dchinner at redhat.com>
Date: Fri May 6 02:54:07 2011 +0000
xfs: make AIL target updates and compares 32bit safe.
The recent conversion of the xfsaild functionality to a work queue
introduced a hard-to-hit log space grant hang. One of the problems
noticed was that updates of the push target are not 32 bit safe as
the target is a 64 bit value.
We cannot copy a 64 bit LSN without the possibility of corrupting
the result when racing with another updating thread. We have
function to do this update safely without needing to care about
32/64 bit issues - xfs_trans_ail_copy_lsn() - so use that when
updating the AIL push target.
Also move the reading of the target in the push work inside the AIL
lock, and use XFS_LSN_CMP() for the unlocked comparison during work
termination to close read holes as well.
Signed-off-by: Dave Chinner <david at fromorbit.com>
Reviewed-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Alex Elder <aelder at sgi.com>
(cherry picked from commit fd5670f22fce247754243cf2ed41941e5762d990)
commit 50e86686dfb287d720af8b0f977202d205c04215
Author: Dave Chinner <dchinner at redhat.com>
Date: Fri May 6 02:54:06 2011 +0000
xfs: always push the AIL to the target
The recent conversion of the xfsaild functionality to a work queue
introduced a hard-to-hit log space grant hang. One of the problems
discovered is a target mismatch between the item pushing loop and
the target itself.
The push trigger checks for the target increasing (i.e. new target >
current) while the push loop only pushes items that have a LSN <
current. As a result, we can get the situation where the push target
is X, the items at the tail of the AIL have LSN X and they don't get
pushed. The push work then completes thinking it is done, and cannot
be restarted until the push target increases to >= X + 1. If the
push target then never increases (because the tail is not moving),
then we never run the push work again and we stall.
Fix it by making sure log items with a LSN that matches the target
exactly are pushed during the loop.
Signed-off-by: Dave Chinner <dchinner at redhat.com>
Reviewed-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Alex Elder <aelder at sgi.com>
(cherry picked from commit cb64026b6e8af50db598ec7c3f59d504259b00bb)
commit 9e7004e741de0b2daabbbadafbaf11ff1a94e00c
Author: Dave Chinner <dchinner at redhat.com>
Date: Fri May 6 02:54:05 2011 +0000
xfs: exit AIL push work correctly when AIL is empty
The recent conversion of the xfsaild functionality to a work queue
introduced a hard-to-hit log space grant hang. The main cause is a
regression where a work exit path fails to clear the PUSHING state
and recheck the target correctly.
Make both exit paths do the same PUSHING bit clearing and target
checking when the "no more work to be done" condition is hit.
Signed-off-by: Dave Chinner <dchinner at redhat.com>
Reviewed-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Alex Elder <aelder at sgi.com>
(cherry picked from commit ea35a20021f8497390d05b93271b4d675516c654)
commit 228d62dd3f74734b9801c789b5addc57fdfc208f
Author: Dave Chinner <dchinner at redhat.com>
Date: Fri May 6 02:54:04 2011 +0000
xfs: ensure reclaim cursor is reset correctly at end of AG
On a 32 bit highmem PowerPC machine, the XFS inode cache was growing
without bound and exhausting low memory causing the OOM killer to be
triggered. After some effort, the problem was reproduced on a 32 bit
x86 highmem machine.
The problem is that the per-ag inode reclaim index cursor was not
getting reset to the start of the AG if the radix tree tag lookup
found no more reclaimable inodes. Hence every further reclaim
attempt started at the same index beyond where any reclaimable
inodes lay, and no further background reclaim ever occurred from the
AG.
Without background inode reclaim the VM driven cache shrinker
simply cannot keep up with cache growth, and OOM is the result.
While the change that exposed the problem was the conversion of the
inode reclaim to use work queues for background reclaim, it was not
the cause of the bug. The bug was introduced when the cursor code
was added, just waiting for some weird configuration to strike....
Signed-off-by: Dave Chinner <dchinner at redhat.com>
Tested-By: Christian Kujau <lists at nerdbynature.de>
Reviewed-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Alex Elder <aelder at sgi.com>
(cherry picked from commit b223221956675ce8a7b436d198ced974bb388571)
-----------------------------------------------------------------------
Summary of changes:
fs/xfs/linux-2.6/xfs_buf.c | 4 ++--
fs/xfs/linux-2.6/xfs_super.c | 3 ++-
fs/xfs/linux-2.6/xfs_sync.c | 5 +++--
fs/xfs/quota/xfs_qm.c | 6 +++---
fs/xfs/xfs_inode.c | 2 +-
5 files changed, 11 insertions(+), 9 deletions(-)
hooks/post-receive
--
XFS development tree
More information about the xfs
mailing list