← Back to branch summary

~davewalker/ubuntu/natty/ocfs2-tools/bug_363877

« back to all changes in this revision

Viewing changes to mkfs.ocfs2/check.c

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2011-01-14 12:46:49 UTC
  • mfrom: (1.1.10 upstream) (0.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20110114124649-vbe5qz211f3zxwuf
Tags: 1.6.3-1ubuntu1
https://launchpad.net/bugs/703008
* Merge from debian unstable (LP: #703008).  Remaining changes:
  - Fix configure tests for ld --as-needed.
  - Fix build failure with ld --no-add-needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mkfs.ocfs2/check.c
90
90
         * First, compare o2cb and disk values.  If we get past this
91
91
         * block (via match or override), the o2cb value takes precedence.
92
92
         */
93
 
        if (disk_value) {
94
 
                if (o2cb_value) {
95
 
                        if (strcmp(o2cb_value, disk_value)) {
96
 
                                fprintf(stderr,
97
 
                                        "%s is configured to use %s \"%s\", but \"%s\" is currently running.\n"
98
 
                                        "%s will not be able to determine if the filesystem is in use.\n",
99
 
                                        s->device_name, what_is_it,
100
 
                                        disk_value, o2cb_value,
101
 
                                        s->progname);
102
 
                                if (!s->force) {
103
 
                                        fprintf(stderr,
104
 
                                                "To skip this check, use --force or -F\n");
105
 
                                        goto out;
106
 
                                }
107
 
                                fprintf(stdout,
108
 
                                        "Overwrite of disk information forced\n");
109
 
                        }
 
93
        if (disk_value && o2cb_value && strcmp(o2cb_value, disk_value)) {
 
94
                fprintf(stderr,
 
95
                        "%s is configured to use %s \"%s\", but \"%s\" is currently running.\n"
 
96
                        "%s will not be able to determine if the filesystem is in use.\n",
 
97
                        s->device_name, what_is_it,
 
98
                        disk_value, o2cb_value,
 
99
                        s->progname);
 
100
                if (!s->force) {
 
101
                        fprintf(stderr, "To skip this check, use --force or -F\n");
 
102
                        goto out;
110
103
                }
 
104
                fprintf(stdout, "Overwrite of disk information forced\n");
111
105
        }
112
106
 
113
107
        if (user_value) {