From: Josef Bacik <josef@toxicpanda.com>

Date: Thu, 22 Aug 2019 15:11:01 -0400

Subject: btrfs: remove orig_bytes from reserve_ticket

Git-commit: def936e53530321bc5454883fa5c7ffdaa635837

Patch-mainline: v5.4-rc1

References: bsc#1165949

Now that we do not do partial filling of tickets simply remove

orig_bytes, it is no longer needed.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>

Signed-off-by: Josef Bacik <josef@toxicpanda.com>

Signed-off-by: David Sterba <dsterba@suse.com>

Acked-by: Nikolay Borisov <nborisov@suse.com>

---

 fs/btrfs/space-info.c | 8 --------

 fs/btrfs/space-info.h | 1 -

 2 files changed, 9 deletions(-)

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c

index 3ab7a4810bef..af53c3344598 100644

--- a/fs/btrfs/space-info.c

+++ b/fs/btrfs/space-info.c

@@ -920,7 +920,6 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info,

 				 struct reserve_ticket *ticket,

 				 enum btrfs_reserve_flush_enum flush)

 {

-	u64 reclaim_bytes = 0;

 	int ret;

 	switch (flush) {

@@ -945,17 +944,11 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info,

 	spin_lock(&space_info->lock);

 	ret = ticket->error;

 	if (ticket->bytes || ticket->error) {

-		if (ticket->bytes < ticket->orig_bytes)

-			reclaim_bytes = ticket->orig_bytes - ticket->bytes;

 		list_del_init(&ticket->list);

 		if (!ret)

 			ret = -ENOSPC;

 	}

 	spin_unlock(&space_info->lock);

-

-	if (reclaim_bytes)

-		btrfs_space_info_add_old_bytes(fs_info, space_info,

-					       reclaim_bytes);

 	ASSERT(list_empty(&ticket->list));

 	return ret;

 }

@@ -1015,7 +1008,6 @@ static int __reserve_metadata_bytes(struct btrfs_fs_info *fs_info,

 	 * the list and we will do our own flushing further down.

 	 */

 	if (ret && flush != BTRFS_RESERVE_NO_FLUSH) {

-		ticket.orig_bytes = orig_bytes;

 		ticket.bytes = orig_bytes;

 		ticket.error = 0;

 		init_waitqueue_head(&ticket.wait);

diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h

index b844e50a6a49..dc6ee66ed600 100644

--- a/fs/btrfs/space-info.h

+++ b/fs/btrfs/space-info.h

@@ -70,7 +70,6 @@ struct btrfs_space_info {

 };

 struct reserve_ticket {

-	u64 orig_bytes;

 	u64 bytes;

 	int error;

 	struct list_head list;