diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 23:06:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 23:06:40 -0400 |
commit | 3711d86a2de17e967b576af8b8a1e9351a7d1466 (patch) | |
tree | f7d6028b81a475a83a6c2471645e0202b2b5f427 /include/linux | |
parent | 89dc77bcdabf42ec99553f5837aa4bb8255a088c (diff) | |
parent | a8855990e382fc81c04187c5fdb48743307baf32 (diff) |
Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
Pull writeback fix from Wu Fengguang:
"A trivial writeback fix"
* tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
writeback: Do not sort b_io list only because of block device inode
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fs.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index a4acd3c61190..3f40547ba191 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -2069,6 +2069,7 @@ extern struct super_block *freeze_bdev(struct block_device *); | |||
2069 | extern void emergency_thaw_all(void); | 2069 | extern void emergency_thaw_all(void); |
2070 | extern int thaw_bdev(struct block_device *bdev, struct super_block *sb); | 2070 | extern int thaw_bdev(struct block_device *bdev, struct super_block *sb); |
2071 | extern int fsync_bdev(struct block_device *); | 2071 | extern int fsync_bdev(struct block_device *); |
2072 | extern int sb_is_blkdev_sb(struct super_block *sb); | ||
2072 | #else | 2073 | #else |
2073 | static inline void bd_forget(struct inode *inode) {} | 2074 | static inline void bd_forget(struct inode *inode) {} |
2074 | static inline int sync_blockdev(struct block_device *bdev) { return 0; } | 2075 | static inline int sync_blockdev(struct block_device *bdev) { return 0; } |
@@ -2088,6 +2089,11 @@ static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb) | |||
2088 | static inline void iterate_bdevs(void (*f)(struct block_device *, void *), void *arg) | 2089 | static inline void iterate_bdevs(void (*f)(struct block_device *, void *), void *arg) |
2089 | { | 2090 | { |
2090 | } | 2091 | } |
2092 | |||
2093 | static inline int sb_is_blkdev_sb(struct super_block *sb) | ||
2094 | { | ||
2095 | return 0; | ||
2096 | } | ||
2091 | #endif | 2097 | #endif |
2092 | extern int sync_filesystem(struct super_block *); | 2098 | extern int sync_filesystem(struct super_block *); |
2093 | extern const struct file_operations def_blk_fops; | 2099 | extern const struct file_operations def_blk_fops; |