diff options
| author | Christoph Hellwig <hch@lst.de> | 2010-06-07 10:20:39 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-07-21 16:01:47 +0200 |
| commit | 4c4d3901225518ed1a4c938ba15ba09842a00770 (patch) | |
| tree | 0ed9eb0ad123174ebdd6ea507ac06b388d0d0b20 /fs/ext3/inode.c | |
| parent | 0411ba7902e09111d6f2041b4697a597d2cf7736 (diff) | |
| download | linux-3.10-4c4d3901225518ed1a4c938ba15ba09842a00770.tar.gz linux-3.10-4c4d3901225518ed1a4c938ba15ba09842a00770.tar.bz2 linux-3.10-4c4d3901225518ed1a4c938ba15ba09842a00770.zip | |
ext3: remove vestiges of nobh support
The nobh option was only supported for writeback mode, but given that all
write paths (except mmapped writed) actually create buffer heads, it
effectively was a no-op already.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext3/inode.c')
| -rw-r--r-- | fs/ext3/inode.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 735f0190ec2..a786db403ef 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -1625,10 +1625,7 @@ static int ext3_writeback_writepage(struct page *page, goto out_fail; } - if (test_opt(inode->i_sb, NOBH) && ext3_should_writeback_data(inode)) - ret = nobh_writepage(page, ext3_get_block, wbc); - else - ret = block_write_full_page(page, ext3_get_block, wbc); + ret = block_write_full_page(page, ext3_get_block, wbc); err = ext3_journal_stop(handle); if (!ret) @@ -1922,17 +1919,6 @@ static int ext3_block_truncate_page(handle_t *handle, struct page *page, length = blocksize - (offset & (blocksize - 1)); iblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits); - /* - * For "nobh" option, we can only work if we don't need to - * read-in the page - otherwise we create buffers to do the IO. - */ - if (!page_has_buffers(page) && test_opt(inode->i_sb, NOBH) && - ext3_should_writeback_data(inode) && PageUptodate(page)) { - zero_user(page, offset, length); - set_page_dirty(page); - goto unlock; - } - if (!page_has_buffers(page)) create_empty_buffers(page, blocksize, 0); |