hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: unify error handling for ticket flushing 

Currently we handle the cleanup of errored out tickets in both the
priority flush path and the normal flushing path.  This is the same code
in both places, so just refactor so we don't duplicate the cleanup work.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Josef Bacik 2019-08-01 18:19:34 -04:00 committed by David Sterba
parent 844245b454
commit 374bf9c5cd
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/btrfs/space-info.c
View File

@ -878,20 +878,19 @@ static void priority_reclaim_metadata_space(struct btrfs_fs_info *fs_info,
} while (flush_state < ARRAY_SIZE(priority_flush_states)); } while (flush_state < ARRAY_SIZE(priority_flush_states));
} }
static int wait_reserve_ticket(struct btrfs_fs_info *fs_info, static void wait_reserve_ticket(struct btrfs_fs_info *fs_info,
struct btrfs_space_info *space_info, struct btrfs_space_info *space_info,
struct reserve_ticket *ticket) struct reserve_ticket *ticket)
{ {
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
u64 reclaim_bytes = 0;
int ret = 0; int ret = 0;
spin_lock(&space_info->lock); spin_lock(&space_info->lock);
while (ticket->bytes > 0 && ticket->error == 0) { while (ticket->bytes > 0 && ticket->error == 0) {
ret = prepare_to_wait_event(&ticket->wait, &wait, TASK_KILLABLE); ret = prepare_to_wait_event(&ticket->wait, &wait, TASK_KILLABLE);
if (ret) { if (ret) {
ret = -EINTR; ticket->error = -EINTR;
break; break;
} }
spin_unlock(&space_info->lock); spin_unlock(&space_info->lock);
@ -901,18 +900,7 @@ static int wait_reserve_ticket(struct btrfs_fs_info *fs_info,
finish_wait(&ticket->wait, &wait); finish_wait(&ticket->wait, &wait);
spin_lock(&space_info->lock); spin_lock(&space_info->lock);
} }
if (!ret)
ret = ticket->error;
if (!list_empty(&ticket->list))
list_del_init(&ticket->list);
if (ticket->bytes && ticket->bytes < ticket->orig_bytes)
reclaim_bytes = ticket->orig_bytes - ticket->bytes;
spin_unlock(&space_info->lock); spin_unlock(&space_info->lock);
if (reclaim_bytes)
btrfs_space_info_add_old_bytes(fs_info, space_info,
reclaim_bytes);
return ret;
} }
/** /**
@ -1010,15 +998,17 @@ static int __reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
return ret; return ret;
if (flush == BTRFS_RESERVE_FLUSH_ALL) if (flush == BTRFS_RESERVE_FLUSH_ALL)
return wait_reserve_ticket(fs_info, space_info, &ticket); wait_reserve_ticket(fs_info, space_info, &ticket);
else
ret = 0;
priority_reclaim_metadata_space(fs_info, space_info, &ticket); priority_reclaim_metadata_space(fs_info, space_info, &ticket);
spin_lock(&space_info->lock); spin_lock(&space_info->lock);
if (ticket.bytes) { ret = ticket.error;
if (ticket.bytes || ticket.error) {
if (ticket.bytes < orig_bytes) if (ticket.bytes < orig_bytes)
reclaim_bytes = orig_bytes - ticket.bytes; reclaim_bytes = orig_bytes - ticket.bytes;
list_del_init(&ticket.list); list_del_init(&ticket.list);
if (!ret)
ret = -ENOSPC; ret = -ENOSPC;
} }
spin_unlock(&space_info->lock); spin_unlock(&space_info->lock);