From 8f6212851c020286162de000a10259b3bdfbb40a Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 2 Oct 2006 10:28:05 -0400
Subject: [PATCH] --- yaml --- r: 38879 b: refs/heads/master c:
 d00223f1693173c7b51f867dd52049955a92d0ed h: refs/heads/master i:   38877:
 88fb47a02724ccb10fd72e5d67eaa3c3b422a9c6   38875:
 eb15db26efdc48666756cd3b0d9981dc5064348f   38871:
 afc84e6826efbb3a4e390e28f5183626b7aff016   38863:
 444e5c3b9a93527eca65d0671e40782aa8153161   38847:
 96bcc28e081ec56fcc96b24489d2976c908f5369 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/gfs2/ops_file.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d4f28f009ebb..419b148ee582 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 930cc237d67dc62464fe71529631d16f51d7aee3
+refs/heads/master: d00223f1693173c7b51f867dd52049955a92d0ed
diff --git a/trunk/fs/gfs2/ops_file.c b/trunk/fs/gfs2/ops_file.c
index f2d0bd80a1c7..fafa48b9105e 100644
--- a/trunk/fs/gfs2/ops_file.c
+++ b/trunk/fs/gfs2/ops_file.c
@@ -606,15 +606,16 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
 	if (fl->fl_type == F_UNLCK) {
 		do_unflock(file, fl);
 		return 0;
-	} else
+	} else {
 		return do_flock(file, cmd, fl);
+	}
 }
 
 const struct file_operations gfs2_file_fops = {
 	.llseek		= gfs2_llseek,
-	.read = do_sync_read,
+	.read		= do_sync_read,
 	.aio_read	= generic_file_aio_read,
-	.write = do_sync_write,
+	.write		= do_sync_write,
 	.aio_write	= generic_file_aio_write,
 	.unlocked_ioctl	= gfs2_ioctl,
 	.mmap		= gfs2_mmap,