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

btrfs-progs: subvol delete: rename variable to match the option name 

Signed-off-by: David Sterba <dsterba@suse.cz>
master
David Sterba 2014-11-27 19:34:22 +01:00
parent 2ed161bd28
commit 1519ee3f58
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmds-subvolume.c
View File

@ -218,10 +218,10 @@ static int cmd_subvol_delete(int argc, char **argv)
char *path;
DIR *dirstream = NULL;
int verbose = 0;
int sync_mode = 0;
int commit_mode = 0;
struct option long_options[] = {
{"commit-after", no_argument, NULL, 'c'}, /* sync mode 1 */
{"commit-each", no_argument, NULL, 'C'}, /* sync mode 2 */
{"commit-after", no_argument, NULL, 'c'}, /* commit mode 1 */
{"commit-each", no_argument, NULL, 'C'}, /* commit mode 2 */
{NULL, 0, NULL, 0}
};
@ -235,10 +235,10 @@ static int cmd_subvol_delete(int argc, char **argv)
switch(c) {
case 'c':
sync_mode = 1;
commit_mode = 1;
break;
case 'C':
sync_mode = 2;
commit_mode = 2;
break;
case 'v':
verbose++;
@ -253,8 +253,8 @@ static int cmd_subvol_delete(int argc, char **argv)
if (verbose > 0) {
printf("Transaction commit: %s\n",
!sync_mode ? "none (default)" :
sync_mode == 1 ? "at the end" : "after each");
!commit_mode ? "none (default)" :
commit_mode == 1 ? "at the end" : "after each");
}
cnt = optind;
@ -310,7 +310,7 @@ again:
}
printf("Delete subvolume (%s): '%s/%s'\n",
sync_mode == 2 || (sync_mode == 1 && cnt + 1 == argc)
commit_mode == 2 || (commit_mode == 1 && cnt + 1 == argc)
? "commit" : "no-commit", dname, vname);
strncpy_null(args.name, vname);
res = ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &args);
@ -323,7 +323,7 @@ again:
goto out;
}
if (sync_mode == 1) {
if (commit_mode == 1) {
res = wait_for_commit(fd);
if (res < 0) {
fprintf(stderr,
@ -347,7 +347,7 @@ out:
goto again;
}
if (sync_mode == 2 && fd != -1) {
if (commit_mode == 2 && fd != -1) {
res = wait_for_commit(fd);
if (res < 0) {
fprintf(stderr,