evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nilfs2: simplify nilfs_mdt_freeze_buffer

Browse source 
nilfs_page_get_nth_block() function used in nilfs_mdt_freeze_buffer()
always returns a valid buffer head, so its validity check can be
removed.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
This commit is contained in:
Ryusuke Konishi 2010-12-27 00:03:02 +09:00
parent 888da23c2f
commit a7a8447ede
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/nilfs2/mdt.c
View file

@ -493,17 +493,16 @@ int nilfs_mdt_freeze_buffer(struct inode *inode, struct buffer_head *bh)
struct buffer_head *bh_frozen; struct buffer_head *bh_frozen;
struct page *page; struct page *page;
int blkbits = inode->i_blkbits; int blkbits = inode->i_blkbits;
int ret = -ENOMEM;
page = grab_cache_page(&shadow->frozen_data, bh->b_page->index); page = grab_cache_page(&shadow->frozen_data, bh->b_page->index);
if (!page) if (!page)
return ret; return -ENOMEM;
if (!page_has_buffers(page)) if (!page_has_buffers(page))
create_empty_buffers(page, 1 << blkbits, 0); create_empty_buffers(page, 1 << blkbits, 0);
bh_frozen = nilfs_page_get_nth_block(page, bh_offset(bh) >> blkbits); bh_frozen = nilfs_page_get_nth_block(page, bh_offset(bh) >> blkbits);
if (bh_frozen) {
if (!buffer_uptodate(bh_frozen)) if (!buffer_uptodate(bh_frozen))
nilfs_copy_buffer(bh_frozen, bh); nilfs_copy_buffer(bh_frozen, bh);
if (list_empty(&bh_frozen->b_assoc_buffers)) { if (list_empty(&bh_frozen->b_assoc_buffers)) {
@ -513,11 +512,10 @@ int nilfs_mdt_freeze_buffer(struct inode *inode, struct buffer_head *bh)
} else { } else {
brelse(bh_frozen); /* already frozen */ brelse(bh_frozen); /* already frozen */
} }
ret = 0;
}
unlock_page(page); unlock_page(page);
page_cache_release(page); page_cache_release(page);
return ret; return 0;
} }
struct buffer_head * struct buffer_head *