btrfs-progs: Replace the overkill assert with normal error message.
authorQu Wenruo <quwenruo@cn.fujitsu.com>
Mon, 28 Apr 2014 08:37:30 +0000 (16:37 +0800)
committerDavid Sterba <dsterba@suse.cz>
Fri, 22 Aug 2014 12:39:31 +0000 (14:39 +0200)
When 'btrfs replace status' encounters an unknown dev replace status, it
will cause an assert, which is somewhat overkilled and can be replaced
with a normal error message.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
cmds-replace.c

index 645dc98..9eb981b 100644 (file)
@@ -449,7 +449,10 @@ static int print_replace_status(int fd, const char *path, int once)
                        break;
                default:
                        prevent_loop = 1;
-                       assert(0);
+                       fprintf(stderr,
+                               "Unknown btrfs dev replace status:%llu",
+                               status->replace_state);
+                       ret = -EINVAL;
                        break;
                }
 
@@ -459,9 +462,9 @@ static int print_replace_status(int fd, const char *path, int once)
                                (unsigned long long)status->num_write_errors,
                                (unsigned long long)
                                 status->num_uncorrectable_read_errors);
-               if (once || prevent_loop) {
+               if (once || prevent_loop || ret) {
                        printf("\n");
-                       return 0;
+                       return ret;
                }
 
                fflush(stdout);