diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-11 13:40:55 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-12-11 13:40:55 +0400 |
| commit | 24c73dabb514223ad547c54b89aa2481ec48ec56 (patch) | |
| tree | 45498c64fc0c19beee0e198d8b93e524774117b3 | |
| parent | 23f608d360719c643bfd6ea3b7389e0abbf954b3 (diff) | |
| parent | e6ab4ea62ac9d5831e0357a7f064ecf5d671a2e6 (diff) | |
| download | linux-linaro-tracking-with-fixes-24c73dabb514223ad547c54b89aa2481ec48ec56.tar.gz | |
Automatically merging tracking-emmc into merge-linux-linaro-core-tracking
Conflicting files:
| -rw-r--r-- | fs/buffer.c | 6 | ||||
| -rw-r--r-- | fs/ext4/ext4_jbd2.c | 4 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 4 | ||||
| -rw-r--r-- | include/linux/buffer_head.h | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index ec0aca8ba6b..41ace98d671 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1715,7 +1715,8 @@ static int __block_write_full_page(struct inode *inode, struct page *page, do { struct buffer_head *next = bh->b_this_page; if (buffer_async_write(bh)) { - submit_bh(write_op, bh); + submit_bh(write_op | + (buffer_meta(bh) << __REQ_META), bh); nr_underway++; } bh = next; @@ -1769,7 +1770,8 @@ recover: struct buffer_head *next = bh->b_this_page; if (buffer_async_write(bh)) { clear_buffer_dirty(bh); - submit_bh(write_op, bh); + submit_bh(write_op | + (buffer_meta(bh) << __REQ_META), bh); nr_underway++; } bh = next; diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index b4323ba846b..27e8adddbff 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c @@ -107,6 +107,8 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, { int err = 0; + set_buffer_meta(bh); + if (ext4_handle_valid(handle)) { err = jbd2_journal_dirty_metadata(handle, bh); if (err) { @@ -143,6 +145,8 @@ int __ext4_handle_dirty_super(const char *where, unsigned int line, struct buffer_head *bh = EXT4_SB(sb)->s_sbh; int err = 0; + set_buffer_meta(bh); + ext4_superblock_csum_set(sb); if (ext4_handle_valid(handle)) { err = jbd2_journal_dirty_metadata(handle, bh); diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index b3c243b9afa..0061da64cb1 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4208,8 +4208,10 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc) err = __ext4_get_inode_loc(inode, &iloc, 0); if (err) return err; - if (wbc->sync_mode == WB_SYNC_ALL) + if (wbc->sync_mode == WB_SYNC_ALL) { + set_buffer_meta(iloc.bh); sync_dirty_buffer(iloc.bh); + } if (buffer_req(iloc.bh) && !buffer_uptodate(iloc.bh)) { EXT4_ERROR_INODE_BLOCK(inode, iloc.bh->b_blocknr, "IO error syncing inode"); diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 458f497738a..13bba1796db 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -34,6 +34,7 @@ enum bh_state_bits { BH_Write_EIO, /* I/O error on write */ BH_Unwritten, /* Buffer is allocated on disk but not written */ BH_Quiet, /* Buffer Error Prinks to be quiet */ + BH_Meta, /* Is meta */ BH_PrivateStart,/* not a state bit, but the first bit available * for private allocation by other entities @@ -124,6 +125,7 @@ BUFFER_FNS(Delay, delay) BUFFER_FNS(Boundary, boundary) BUFFER_FNS(Write_EIO, write_io_error) BUFFER_FNS(Unwritten, unwritten) +BUFFER_FNS(Meta, meta) #define bh_offset(bh) ((unsigned long)(bh)->b_data & ~PAGE_MASK) #define touch_buffer(bh) mark_page_accessed(bh->b_page) |