← Back to branch summary

~ubuntu-branches/debian/stretch/lvm2/stretch

« back to all changes in this revision

Viewing changes to tools/dmsetup.c

  • Committer: Package Import Robot
  • Author(s): Bastian Blank
  • Date: 2014-09-06 19:26:39 UTC
  • mfrom: (30.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20140906192639-szba1fg0f2jigj7c
Tags: 2.02.111-1
* New upstream version.
* Install more systemd units:
  - Add dm-event.service and dm-event.socket to dmeventd.
  - Add lvm2-monitor.service to lvm2 and start it.
* Enable monitoring by default:
  - Add dependency on dmeventd to lvm2 and liblvm2cmd2.02.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/dmsetup.c
120
120
        ADD_NODE_ON_RESUME_ARG,
121
121
        CHECKS_ARG,
122
122
        COLS_ARG,
 
123
        DEFERRED_ARG,
123
124
        SELECT_ARG,
124
125
        EXEC_ARG,
125
126
        FORCE_ARG,
468
469
 
469
470
        printf("Name:              %s\n", dm_task_get_name(dmt));
470
471
 
471
 
        printf("State:             %s%s\n",
 
472
        printf("State:             %s%s%s\n",
472
473
               info->suspended ? "SUSPENDED" : "ACTIVE",
473
 
               info->read_only ? " (READ-ONLY)" : "");
 
474
               info->read_only ? " (READ-ONLY)" : "",
 
475
               info->deferred_remove ? " (DEFERRED REMOVE)" : "");
474
476
 
475
477
        /* FIXME Old value is being printed when it's being changed. */
476
478
        if (dm_task_get_read_ahead(dmt, &read_ahead))
894
896
 
895
897
static int _splitname(CMD_ARGS)
896
898
{
897
 
        struct dmsetup_report_obj obj;
898
 
        int r = 1;
 
899
        struct dmsetup_report_obj obj = { NULL };
 
900
        int r;
899
901
 
900
 
        obj.task = NULL;
901
 
        obj.info = NULL;
902
 
        obj.deps_task = NULL;
903
 
        obj.tree_node = NULL;
904
902
        if (!(obj.split_name = _get_split_name((argc == 3) ? argv[2] : "LVM",
905
903
                                               argv[1], '\0')))
906
904
                return_0;
1321
1319
        if (_switches[RETRY_ARG] && task == DM_DEVICE_REMOVE)
1322
1320
                dm_task_retry_remove(dmt);
1323
1321
 
 
1322
        if (_switches[DEFERRED_ARG] && (task == DM_DEVICE_REMOVE || task == DM_DEVICE_REMOVE_ALL))
 
1323
                dm_task_deferred_remove(dmt);
 
1324
 
1324
1325
        r = dm_task_run(dmt);
1325
1326
 
1326
1327
      out:
3071
3072
          "\t                  [-u|uuid <uuid>] [{--addnodeonresume|--addnodeoncreate}]\n"
3072
3073
          "\t                  [--notable | --table <table> | <table_file>]",
3073
3074
         1, 2,0,  _create},
3074
 
        {"remove", "[-f|--force] <device>", 0, -1, 1, _remove},
 
3075
        {"remove", "[-f|--force] [--deferred] <device>", 0, -1, 1, _remove},
3075
3076
        {"remove_all", "[-f|--force]", 0, 0, 0,  _remove_all},
3076
3077
        {"suspend", "[--noflush] <device>", 0, -1, 1, _suspend},
3077
3078
        {"resume", "<device> [{--addnodeonresume|--addnodeoncreate}]", 0, -1, 1, _resume},
3521
3522
                {"readonly", 0, &ind, READ_ONLY},
3522
3523
                {"checks", 0, &ind, CHECKS_ARG},
3523
3524
                {"columns", 0, &ind, COLS_ARG},
 
3525
                {"deferred", 0, &ind, DEFERRED_ARG},
3524
3526
                {"select", 1, &ind, SELECT_ARG},
3525
3527
                {"exec", 1, &ind, EXEC_ARG},
3526
3528
                {"force", 0, &ind, FORCE_ARG},
3694
3696
                        /* FIXME Accept modes as per chmod */
3695
3697
                        _int_args[MODE_ARG] = (int) strtol(optarg, NULL, 8);
3696
3698
                }
 
3699
                if (ind == DEFERRED_ARG)
 
3700
                        _switches[DEFERRED_ARG]++;
3697
3701
                if (ind == EXEC_ARG) {
3698
3702
                        _switches[EXEC_ARG]++;
3699
3703
                        _command = optarg;