TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext3 -nobh option causes oops

Browse Source 
For files other than IFREG, nobh option doesn't make sense.  Modifications
to them are journalled and needs buffer heads to do that.  Without this
patch, we get kernel oops in page_buffers().

Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
Badari Pulavarty
2006-11-17 17:47:22 +01:00
committed by Adrian Bunk
parent 39a2b41be7
commit 770af3b42a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/ext3/inode.c
+3 -3
View File
@@ -1005,7 +1005,7 @@ retry:
ret = PTR_ERR(handle);
goto out;
}
if (test_opt(inode->i_sb, NOBH))
if (test_opt(inode->i_sb, NOBH) && ext3_should_writeback_data(inode))
ret = nobh_prepare_write(page, from, to, ext3_get_block);
else
ret = block_prepare_write(page, from, to, ext3_get_block);
@@ -1093,7 +1093,7 @@ static int ext3_writeback_commit_write(struct file *file, struct page *page,
if (new_i_size > EXT3_I(inode)->i_disksize)
EXT3_I(inode)->i_disksize = new_i_size;
if (test_opt(inode->i_sb, NOBH))
if (test_opt(inode->i_sb, NOBH) && ext3_should_writeback_data(inode))
ret = nobh_commit_write(file, page, from, to);
else
ret = generic_commit_write(file, page, from, to);
@@ -1343,7 +1343,7 @@ static int ext3_writeback_writepage(struct page *page,
goto out_fail;
}
if (test_opt(inode->i_sb, NOBH))
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);