From f719b566eb785a6d348f7fedb280cf41b7392587 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 3 Oct 2008 12:24:01 -0400
Subject: [PATCH] --- yaml --- r: 128970 b: refs/heads/master c:
 30c43e2444c16afe3b2130f40ad273541bf3dc36 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/fs/btrfs/ctree.h       | 1 -
 trunk/fs/btrfs/extent-tree.c | 7 -------
 trunk/fs/btrfs/transaction.c | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 67930406c156..15c6c38637ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb843a6f513a1a91c54951005e60bd9b95bdf973
+refs/heads/master: 30c43e2444c16afe3b2130f40ad273541bf3dc36
diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h
index 94e0cdfddc0c..8566eb30f567 100644
--- a/trunk/fs/btrfs/ctree.h
+++ b/trunk/fs/btrfs/ctree.h
@@ -672,7 +672,6 @@ struct btrfs_fs_info {
 	u64 delalloc_bytes;
 	u64 last_alloc;
 	u64 last_data_alloc;
-	u64 last_log_alloc;
 
 	spinlock_t ref_cache_lock;
 	u64 total_ref_cache_size;
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index db37b867e4f1..29380467b671 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -2228,13 +2228,6 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
 	if ((data & BTRFS_BLOCK_GROUP_DATA) && btrfs_test_opt(root, SSD))
 		last_ptr = &root->fs_info->last_data_alloc;
 
-	if (root->root_key.objectid == BTRFS_TREE_LOG_OBJECTID) {
-		last_ptr = &root->fs_info->last_log_alloc;
-		if (!last_ptr == 0 && root->fs_info->last_alloc) {
-			*last_ptr = root->fs_info->last_alloc + empty_cluster;
-		}
-	}
-
 	if (last_ptr) {
 		if (*last_ptr)
 			hint_byte = *last_ptr;
diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c
index 11266d68a6c9..5ecc24d634a2 100644
--- a/trunk/fs/btrfs/transaction.c
+++ b/trunk/fs/btrfs/transaction.c
@@ -61,7 +61,6 @@ static noinline int join_transaction(struct btrfs_root *root)
 		root->fs_info->generation++;
 		root->fs_info->last_alloc = 0;
 		root->fs_info->last_data_alloc = 0;
-		root->fs_info->last_log_alloc = 0;
 		cur_trans->num_writers = 1;
 		cur_trans->num_joined = 0;
 		cur_trans->transid = root->fs_info->generation;