marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: Fix wrong return value of wait_for_subvolume_cleaning() 

Reproduce:
 # btrfs subvolume sync /mnt/btrfs
 Subvolume id 323 is gone
 # echo $?
 1
 #

Reason:
 wait_for_subvolume_cleaning() return !0 in right case, because
 value of ret is set to "is subvolume clean" state before return.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Zhao Lei 2015-08-26 22:03:38 +08:00 committed by David Sterba
parent 6425752ab2
commit 298746b958
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmds-subvolume.c
View File

@ -66,7 +66,7 @@ static int is_subvolume_cleaned(int fd, u64 subvolid)
static int wait_for_subvolume_cleaning(int fd, int count, u64 *ids,
int sleep_interval)
{
int ret = 0;
int ret;
int remaining;
int i;
@ -92,6 +92,8 @@ static int wait_for_subvolume_cleaning(int fd, int count, u64 *ids,
break;
sleep(sleep_interval);
}
ret = 0;
out:
return ret;
}