From 9771922d9179b87b95edcf5c036946e9a93660ef Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 22 May 2014 10:42:35 +1000
Subject: [PATCH] fs-add-generic-data-flush-to-fsync-fix

nuke ifdef

Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 fs/libfs.c             | 5 -----
 include/linux/blkdev.h | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fs/libfs.c b/fs/libfs.c
index 3a704e194d63..88e3e00e2eca 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -982,12 +982,7 @@ int generic_file_fsync(struct file *file, loff_t start, loff_t end,
 	err = __generic_file_fsync(file, start, end, datasync);
 	if (err)
 		return err;
-#ifdef CONFIG_BLOCK
 	return blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
-#else
-	return err;
-#endif
-
 }
 EXPORT_SYMBOL(generic_file_fsync);
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 0d84981ee03f..5e14a3382bf4 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1624,6 +1624,12 @@ static inline bool blk_needs_flush_plug(struct task_struct *tsk)
 	return false;
 }
 
+static inline int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask,
+				     sector_t *error_sector)
+{
+	return 0;
+}
+
 #endif /* CONFIG_BLOCK */
 
 #endif
-- 
2.39.5