diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 17:06:39 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 17:06:39 +1200 |
| commit | 480082968a78151e731ebd304eeb6cada61a1cd1 (patch) | |
| tree | 263179c267b99763cb4fd952b24870cca28d14a7 /fs/xfs/xfs_buf_item.c | |
| parent | 95bc156c62a57cda1b225e03ae23eb2764ee1046 (diff) | |
| parent | 0030807c66f058230bcb20d2573bcaf28852e804 (diff) | |
| download | linux-480082968a78151e731ebd304eeb6cada61a1cd1.tar.bz2 | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: revert to using a kthread for AIL pushing
xfs: force the log if we encounter pinned buffers in .iop_pushbuf
xfs: do not update xa_last_pushed_lsn for locked items
Diffstat (limited to 'fs/xfs/xfs_buf_item.c')
| -rw-r--r-- | fs/xfs/xfs_buf_item.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index cac2ecfa6746..ef43fce519a1 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c @@ -629,7 +629,7 @@ xfs_buf_item_push( * the xfsbufd to get this buffer written. We have to unlock the buffer * to allow the xfsbufd to write it, too. */ -STATIC void +STATIC bool xfs_buf_item_pushbuf( struct xfs_log_item *lip) { @@ -643,6 +643,7 @@ xfs_buf_item_pushbuf( xfs_buf_delwri_promote(bp); xfs_buf_relse(bp); + return true; } STATIC void |