diff --git a/[refs] b/[refs]
index 639d891909e3..d4f28f009ebb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c9eb21eee1790804ce407fd820f65be0b4fdd03
+refs/heads/master: 930cc237d67dc62464fe71529631d16f51d7aee3
diff --git a/trunk/fs/gfs2/ops_file.c b/trunk/fs/gfs2/ops_file.c
index a05b75a7ed8e..f2d0bd80a1c7 100644
--- a/trunk/fs/gfs2/ops_file.c
+++ b/trunk/fs/gfs2/ops_file.c
@@ -612,9 +612,9 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
 
 const struct file_operations gfs2_file_fops = {
 	.llseek		= gfs2_llseek,
-	.read		= generic_file_read,
+	.read = do_sync_read,
 	.aio_read	= generic_file_aio_read,
-	.write		= generic_file_write,
+	.write = do_sync_write,
 	.aio_write	= generic_file_aio_write,
 	.unlocked_ioctl	= gfs2_ioctl,
 	.mmap		= gfs2_mmap,