From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 7 Jun 2010 12:03:44 +0200
Subject: [Cluster-devel] [PATCH] gfs2: stop using mpage_writepage
Message-ID: <20100607100344.GA1990@lst.de>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

GFS2 always creates buffer_heads during ->write_begin or ->page_mkwrite,
which means mpage_writepage always falls back to block_write_full_page.

So stop calling mpage_writepage and always call block_write_full_page
directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: linux-2.6/fs/gfs2/aops.c
===================================================================
--- linux-2.6.orig/fs/gfs2/aops.c	2010-06-07 11:22:42.239273013 +0200
+++ linux-2.6/fs/gfs2/aops.c	2010-06-07 11:23:23.563255580 +0200
@@ -136,10 +136,7 @@ static int gfs2_writeback_writepage(stru
 	if (ret <= 0)
 		return ret;
 
-	ret = mpage_writepage(page, gfs2_get_block_noalloc, wbc);
-	if (ret == -EAGAIN)
-		ret = block_write_full_page(page, gfs2_get_block_noalloc, wbc);
-	return ret;
+	return block_write_full_page(page, gfs2_get_block_noalloc, wbc);
 }
 
 /**