From mboxrd@z Thu Jan  1 00:00:00 1970
From: swhiteho@redhat.com <swhiteho@redhat.com>
Date: Mon, 21 Jan 2008 09:21:59 +0000
Subject: [Cluster-devel] [PATCH 41/58] [GFS2] Function meta_read optimization
In-Reply-To: <12009074103982-git-send-email-swhiteho@redhat.com>
References: <1200907336293-git-send-email-swhiteho@redhat.com>
	<12009073443813-git-send-email-swhiteho@redhat.com>
	<12009073453549-git-send-email-swhiteho@redhat.com>
	<1200907348435-git-send-email-swhiteho@redhat.com>
	<12009073492811-git-send-email-swhiteho@redhat.com>
	<12009073512300-git-send-email-swhiteho@redhat.com>
	<12009073531216-git-send-email-swhiteho@redhat.com>
	<12009073542596-git-send-email-swhiteho@redhat.com>
	<1200907356883-git-send-email-swhiteho@redhat.com>
	<12009073571991-git-send-email-swhiteho@redhat.com>
	<12009073591688-git-send-email-swhiteho@redhat.com>
	<12009073611695-git-send-email-swhiteho@redhat.com>
	<1200907362266-git-send-email-swhiteho@redhat.com>
	<12009073642512-git-send-email-swhiteho@redhat.com>
	<12009073662309-git-send-email-swhiteho@redhat.com>
	<12009073671755-git-send-email-swhiteho@redhat.com>
	<12009073698-git-send-email-swhiteho@redhat.com>
	<12009073701982-git-send-email-swhiteho@redhat.com>
	<12009073722253-git-send-email-swhiteho@redhat.com>
	<1200907374616-git-send-email-swhiteho@redhat.com>
	<12009073753723-git-send-email-swhiteho@redhat.com>
	<12009073771883-git-send-email-swhiteho@redhat.com>
	<1200907378664-git-send-email-swhiteho@redhat.com>
	<12009073803732-git-send-email-swhiteho@redhat.com>
	<12009073823161-git-send-email-swhiteho@redhat.com>
	<12009073841692-git-send-email-swhiteho@redhat.com>
	<12009073862261-git-send-email-swhiteho@redhat.com>
	<12009073883125-git-send-email-swhiteho@redhat.com>
	<12009073891848-git-send-email-swhiteho@redhat.com>
	<12009073913676-git-send-email-swhiteho@redhat.com>
	<12009073933630-git-send-email-swhiteho@redhat.com>
	<12009073953412-git-send-email-swhiteho@redhat.com>
	<1200907397123-git-send-email-swhiteho@redhat.com>
	<12009073981159-git-send-email-swhiteho@redhat.com>
	<12009074002775-git-send-email-swhiteho@redhat.com>
	<12009074021586-git-send-email-swhiteho@redhat.com>
	<12009074032614-git-send-email-swhiteho@redhat.com>
	<1200907405414-git-send-email-swhiteho@redhat.com>
	<12009074074196-git-send-email-swhiteho@redhat.com>
	<12009074082286-git-send-email-swhiteho@redhat.com>
	<12009074103982-git-send-email-swhiteho@redhat.com>
Message-ID: <12009074121930-git-send-email-swhiteho@redhat.com>
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

From: Bob Peterson <rpeterso@redhat.com>

This patch optimizes function gfs2_meta_read.  Basically, gfs2_meta_wait
was being called regardless of whether a disk read was requested.
This just pulls that wait into the if that triggers the read.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 9688785..bc28bc6 100644
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -222,13 +222,14 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,
 		   struct buffer_head **bhp)
 {
 	*bhp = getbuf(gl, blkno, CREATE);
-	if (!buffer_uptodate(*bhp))
+	if (!buffer_uptodate(*bhp)) {
 		ll_rw_block(READ_META, 1, bhp);
-	if (flags & DIO_WAIT) {
-		int error = gfs2_meta_wait(gl->gl_sbd, *bhp);
-		if (error) {
-			brelse(*bhp);
-			return error;
+		if (flags & DIO_WAIT) {
+			int error = gfs2_meta_wait(gl->gl_sbd, *bhp);
+			if (error) {
+				brelse(*bhp);
+				return error;
+			}
 		}
 	}
 
-- 
1.5.1.2