Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 128820
b: refs/heads/master
c: 77a41af
h: refs/heads/master
v: v3
  • Loading branch information
Chris Mason committed Sep 25, 2008
1 parent c817a41 commit 8c90290
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7d9eb12c8739e7dc80c78c6b3596f912ecd8f941
refs/heads/master: 77a41afb7d0dd0f27b6f2f1a5bc701929c7034de
2 changes: 0 additions & 2 deletions trunk/fs/btrfs/disk-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -1117,9 +1117,7 @@ static int cleaner_kthread(void *arg)

vfs_check_frozen(root->fs_info->sb, SB_FREEZE_WRITE);
mutex_lock(&root->fs_info->cleaner_mutex);
printk("cleaner awake\n");
btrfs_clean_old_snapshots(root);
printk("cleaner done\n");
mutex_unlock(&root->fs_info->cleaner_mutex);

if (freezing(current)) {
Expand Down
2 changes: 0 additions & 2 deletions trunk/fs/btrfs/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
root->fs_info->btree_inode->i_mapping, GFP_NOFS);

trans->transaction->in_commit = 1;
printk("trans %Lu in commit\n", trans->transid);
cur_trans = trans->transaction;
if (cur_trans->list.prev != &root->fs_info->trans_list) {
prev_trans = list_entry(cur_trans->list.prev,
Expand Down Expand Up @@ -748,7 +747,6 @@ printk("trans %Lu in commit\n", trans->transid);
kfree(pinned_copy);

cur_trans->commit_done = 1;
printk("trans %Lu done in commit\n", cur_trans->transid);
root->fs_info->last_trans_committed = cur_trans->transid;
wake_up(&cur_trans->commit_wait);
put_transaction(cur_trans);
Expand Down

0 comments on commit 8c90290

Please sign in to comment.