RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-25 15:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Btrfs-progs: fix magic return value in cmds-device.c

Browse Source 
Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Wang Shilong 2013-09-04 23:22:22 +08:00 committed by Chris Mason
parent a74e3b4145
commit d57dff4183
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmds-device.c
View File

@ -55,7 +55,7 @@ static int cmd_add_dev(int argc, char **argv)
fdmnt = open_file_or_dir(mntpnt, &dirstream); fdmnt = open_file_or_dir(mntpnt, &dirstream);
if (fdmnt < 0) { if (fdmnt < 0) {
fprintf(stderr, "ERROR: can't access to '%s'\n", mntpnt); fprintf(stderr, "ERROR: can't access to '%s'\n", mntpnt);
return 12; return 1;
} }
for (i = 1; i < argc - 1; i++ ){ for (i = 1; i < argc - 1; i++ ){
@ -120,10 +120,7 @@ static int cmd_add_dev(int argc, char **argv)
} }
close_file_or_dir(fdmnt, dirstream); close_file_or_dir(fdmnt, dirstream);
if (ret) return !!ret;
return ret+20;
else
return 0;
} }
static const char * const cmd_rm_dev_usage[] = { static const char * const cmd_rm_dev_usage[] = {
@ -146,7 +143,7 @@ static int cmd_rm_dev(int argc, char **argv)
fdmnt = open_file_or_dir(mntpnt, &dirstream); fdmnt = open_file_or_dir(mntpnt, &dirstream);
if (fdmnt < 0) { if (fdmnt < 0) {
fprintf(stderr, "ERROR: can't access to '%s'\n", mntpnt); fprintf(stderr, "ERROR: can't access to '%s'\n", mntpnt);
return 12; return 1;
} }
for(i=1 ; i < argc - 1; i++ ){ for(i=1 ; i < argc - 1; i++ ){
@ -170,10 +167,7 @@ static int cmd_rm_dev(int argc, char **argv)
} }
close_file_or_dir(fdmnt, dirstream); close_file_or_dir(fdmnt, dirstream);
if( ret) return !!ret;
return ret+20;
else
return 0;
} }
static const char * const cmd_scan_dev_usage[] = { static const char * const cmd_scan_dev_usage[] = {
@ -202,7 +196,7 @@ static int cmd_scan_dev(int argc, char **argv)
ret = scan_for_btrfs(where, 1); ret = scan_for_btrfs(where, 1);
if (ret){ if (ret){
fprintf(stderr, "ERROR: error %d while scanning\n", ret); fprintf(stderr, "ERROR: error %d while scanning\n", ret);
return 18; return 1;
} }
return 0; return 0;
} }
@ -210,7 +204,7 @@ static int cmd_scan_dev(int argc, char **argv)
fd = open("/dev/btrfs-control", O_RDWR); fd = open("/dev/btrfs-control", O_RDWR);
if (fd < 0) { if (fd < 0) {
perror("failed to open /dev/btrfs-control"); perror("failed to open /dev/btrfs-control");
return 10; return 1;
} }
for( i = devstart ; i < argc ; i++ ){ for( i = devstart ; i < argc ; i++ ){
@ -232,7 +226,7 @@ static int cmd_scan_dev(int argc, char **argv)
close(fd); close(fd);
fprintf(stderr, "ERROR: unable to scan the device '%s' - %s\n", fprintf(stderr, "ERROR: unable to scan the device '%s' - %s\n",
argv[i], strerror(e)); argv[i], strerror(e));
return 11; return 1;
} }
} }
@ -258,7 +252,7 @@ static int cmd_ready_dev(int argc, char **argv)
fd = open("/dev/btrfs-control", O_RDWR); fd = open("/dev/btrfs-control", O_RDWR);
if (fd < 0) { if (fd < 0) {
perror("failed to open /dev/btrfs-control"); perror("failed to open /dev/btrfs-control");
return 10; return 1;
} }
strncpy(args.name, argv[argc - 1], BTRFS_PATH_NAME_MAX); strncpy(args.name, argv[argc - 1], BTRFS_PATH_NAME_MAX);
@ -320,7 +314,7 @@ static int cmd_dev_stats(int argc, char **argv)
if (fdmnt < 0) { if (fdmnt < 0) {
fprintf(stderr, "ERROR: can't access '%s'\n", dev_path); fprintf(stderr, "ERROR: can't access '%s'\n", dev_path);
return 12; return 1;
} }
ret = get_fs_info(dev_path, &fi_args, &di_args); ret = get_fs_info(dev_path, &fi_args, &di_args);