summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_buf_item.c
diff options
context:
space:
mode:
authorAlex Elder <aelder@sgi.com>2011-10-17 15:42:02 -0500
committerAlex Elder <aelder@sgi.com>2011-10-17 15:42:02 -0500
commit9508534c5f170ada5a745cde0df49732718440e9 (patch)
tree2b0f1e19aa529e77720522d13541adedbc46564e /fs/xfs/xfs_buf_item.c
parent5a93a064d27b42e4af1772b0599b53e3241191ac (diff)
parenta84a79e4d369a73c0130b5858199e949432da4c6 (diff)
downloadop-kernel-dev-9508534c5f170ada5a745cde0df49732718440e9.zip
op-kernel-dev-9508534c5f170ada5a745cde0df49732718440e9.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Resolved conflicts: fs/xfs/xfs_trans_priv.h: - deleted struct xfs_ail field xa_flags - kept field xa_log_flush in struct xfs_ail fs/xfs/xfs_trans_ail.c: - in xfsaild_push(), in XFS_ITEM_PUSHBUF case, replaced "flush_log = 1" with "ailp->xa_log_flush++" Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_buf_item.c')
-rw-r--r--fs/xfs/xfs_buf_item.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 65d6f44..1a35138 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
OpenPOWER on IntegriCloud