Merge branch 'for-4.4/io-poll' of git://git.kernel.dk/linux-block

[linux-2.6-block.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 49749688156d91a12f68ab78ebc29685fa59ce88..6230eb2a9ccadc1657a25b88e48f09e9560e067f 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2409,6 +2409,7 @@ extern int write_inode_now(struct inode *, int);
 extern int filemap_fdatawrite(struct address_space *);
 extern int filemap_flush(struct address_space *);
 extern int filemap_fdatawait(struct address_space *);
+extern void filemap_fdatawait_keep_errors(struct address_space *);
 extern int filemap_fdatawait_range(struct address_space *, loff_t lstart,
                                   loff_t lend);
 extern int filemap_write_and_wait(struct address_space *mapping);
@@ -2612,7 +2613,7 @@ static inline void remove_inode_hash(struct inode *inode)
 extern void inode_sb_list_add(struct inode *inode);
 
 #ifdef CONFIG_BLOCK
-extern void submit_bio(int, struct bio *);
+extern blk_qc_t submit_bio(int, struct bio *);
 extern int bdev_read_only(struct block_device *);
 #endif
 extern int set_blocksize(struct block_device *, int);