Merge commit 'v2.6.32-rc6' into perf/core

Conflicts:
	tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 13 insertions, 8 deletions

diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c
index 5941958f1e47..84c25382f8e3 100644
--- a/fs/nilfs2/btnode.c
+++ b/fs/nilfs2/btnode.c
@@ -87,6 +87,7 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
                         brelse(bh);
                         BUG();
                 }
+                memset(bh->b_data, 0, 1 << inode->i_blkbits);
                 bh->b_bdev = NILFS_I_NILFS(inode)->ns_bdev;
                 bh->b_blocknr = blocknr;
                 set_buffer_mapped(bh);
@@ -276,8 +277,7 @@ void nilfs_btnode_commit_change_key(struct address_space *btnc,
                                        "invalid oldkey %lld (newkey=%lld)",
                                        (unsigned long long)oldkey,
                                        (unsigned long long)newkey);
-                if (!test_set_buffer_dirty(obh) && TestSetPageDirty(opage))
-                        BUG();
+                nilfs_btnode_mark_dirty(obh);
 
                 spin_lock_irq(&btnc->tree_lock);
                 radix_tree_delete(&btnc->page_tree, oldkey);
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 683df89dbae5..6eff66a070d5 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -2468,17 +2468,22 @@ static void nilfs_segctor_notify(struct nilfs_sc_info *sci,
         /* Clear requests (even when the construction failed) */
         spin_lock(&sci->sc_state_lock);
 
-        sci->sc_state &= ~NILFS_SEGCTOR_COMMIT;
-
         if (req->mode == SC_LSEG_SR) {
+                sci->sc_state &= ~NILFS_SEGCTOR_COMMIT;
                 sci->sc_seq_done = req->seq_accepted;
                 nilfs_segctor_wakeup(sci, req->sc_err ? : req->sb_err);
                 sci->sc_flush_request = 0;
-        } else if (req->mode == SC_FLUSH_FILE)
-                sci->sc_flush_request &= ~FLUSH_FILE_BIT;
-        else if (req->mode == SC_FLUSH_DAT)
-                sci->sc_flush_request &= ~FLUSH_DAT_BIT;
+        } else {
+                if (req->mode == SC_FLUSH_FILE)
+                        sci->sc_flush_request &= ~FLUSH_FILE_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);
 }