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>

diff --git a/fs/libfs.c b/fs/libfs.c
index 3a704e194d635efe8a29ed1c62efe2b6c4afc707..88e3e00e2eca0d72aa2bc2af350682d26ca7c7ca 100644 (file)
--- 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 0d84981ee03fc1c9d7bd5b656611b8b87af696e0..5e14a3382bf4af7c773fde5c842baa9a5b40bb9d 100644 (file)
--- 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