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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2

Browse source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: add zero-fill for new btree node buffers
  nilfs2: fix irregular checkpoint creation due to data flush
  nilfs2: fix dirty page accounting leak causing hang at write
This commit is contained in:
Linus Torvalds 2009-11-03 07:45:22 -08:00
commit 1cec2cdee4
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/nilfs2/btnode.c
View file

@ -87,6 +87,7 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
brelse(bh); brelse(bh);
BUG(); BUG();
} }
memset(bh->b_data, 0, 1 << inode->i_blkbits);
bh->b_bdev = NILFS_I_NILFS(inode)->ns_bdev; bh->b_bdev = NILFS_I_NILFS(inode)->ns_bdev;
bh->b_blocknr = blocknr; bh->b_blocknr = blocknr;
set_buffer_mapped(bh); set_buffer_mapped(bh);
@ -276,8 +277,7 @@ void nilfs_btnode_commit_change_key(struct address_space *btnc,
"invalid oldkey %lld (newkey=%lld)", "invalid oldkey %lld (newkey=%lld)",
(unsigned long long)oldkey, (unsigned long long)oldkey,
(unsigned long long)newkey); (unsigned long long)newkey);
if (!test_set_buffer_dirty(obh) && TestSetPageDirty(opage)) nilfs_btnode_mark_dirty(obh);
BUG();
spin_lock_irq(&btnc->tree_lock); spin_lock_irq(&btnc->tree_lock);
radix_tree_delete(&btnc->page_tree, oldkey); radix_tree_delete(&btnc->page_tree, oldkey);

17
fs/nilfs2/segment.c
View file

@ -2468,17 +2468,22 @@ static void nilfs_segctor_notify(struct nilfs_sc_info *sci,
/* Clear requests (even when the construction failed) */ /* Clear requests (even when the construction failed) */
spin_lock(&sci->sc_state_lock); spin_lock(&sci->sc_state_lock);
sci->sc_state &= ~NILFS_SEGCTOR_COMMIT;
if (req->mode == SC_LSEG_SR) { if (req->mode == SC_LSEG_SR) {
sci->sc_state &= ~NILFS_SEGCTOR_COMMIT;
sci->sc_seq_done = req->seq_accepted; sci->sc_seq_done = req->seq_accepted;
nilfs_segctor_wakeup(sci, req->sc_err ? : req->sb_err); nilfs_segctor_wakeup(sci, req->sc_err ? : req->sb_err);
sci->sc_flush_request = 0; sci->sc_flush_request = 0;
} else if (req->mode == SC_FLUSH_FILE) } else {
sci->sc_flush_request &= ~FLUSH_FILE_BIT; if (req->mode == SC_FLUSH_FILE)
else if (req->mode == SC_FLUSH_DAT) sci->sc_flush_request &= ~FLUSH_FILE_BIT;
sci->sc_flush_request &= ~FLUSH_DAT_BIT; else if (req->mode == SC_FLUSH_DAT)
sci->sc_flush_request &= ~FLUSH_DAT_BIT;
/* re-enable timer if checkpoint creation was not done */
if (sci->sc_timer && (sci->sc_state & NILFS_SEGCTOR_COMMIT) &&
time_before(jiffies, sci->sc_timer->expires))
add_timer(sci->sc_timer);
}
spin_unlock(&sci->sc_state_lock); spin_unlock(&sci->sc_state_lock);
} }