Commit 2e84fecf authored by Heinz Mauelshagen's avatar Heinz Mauelshagen Committed by Mike Snitzer
Browse files

dm: avoid split of quoted strings where possible 



Signed-off-by: default avatarHeinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
parent 2d0f25cb

drivers/md/dm-crypt.c

+1 −2
Original line number Diff line number Diff line
@@ -733,8 +733,7 @@ static int crypt_iv_eboiv_ctr(struct crypt_config *cc, struct dm_target *ti, 
	}



	if (crypto_skcipher_blocksize(any_tfm(cc)) != cc->iv_size) {

		ti->error = "Block size of EBOIV cipher does "

			    "not match IV size of block cipher";

		ti->error = "Block size of EBOIV cipher does not match IV size of block cipher";

		return -EINVAL;

	}

drivers/md/dm-ioctl.c

+2 −4
Original line number Diff line number Diff line
@@ -449,8 +449,7 @@ static struct mapped_device *dm_hash_rename(struct dm_ioctl *param, 
		hc = __get_name_cell(new);



	if (hc) {

		DMERR("Unable to change %s on mapped device %s to one that "

		      "already exists: %s",

		DMERR("Unable to change %s on mapped device %s to one that already exists: %s",

		      change_uuid ? "uuid" : "name",

		      param->name, new);

		dm_put(hc->md);
@@ -1838,8 +1837,7 @@ static int check_version(unsigned int cmd, struct dm_ioctl __user *user) 


	if ((DM_VERSION_MAJOR != version[0]) ||

	    (DM_VERSION_MINOR < version[1])) {

		DMERR("ioctl interface mismatch: "

		      "kernel(%u.%u.%u), user(%u.%u.%u), cmd(%d)",

		DMERR("ioctl interface mismatch: kernel(%u.%u.%u), user(%u.%u.%u), cmd(%d)",

		      DM_VERSION_MAJOR, DM_VERSION_MINOR,

		      DM_VERSION_PATCHLEVEL,

		      version[0], version[1], version[2], cmd);

drivers/md/dm-log-userspace-transfer.c

+2 −3
Original line number Diff line number Diff line
@@ -109,9 +109,8 @@ static int fill_pkg(struct cn_msg *msg, struct dm_ulog_request *tfr) 
			if (pkg->error != -EAGAIN)

				*(pkg->data_size) = 0;

		} else if (tfr->data_size > *(pkg->data_size)) {

			DMERR("Insufficient space to receive package [%u] "

			      "(%u vs %zu)", tfr->request_type,

			      tfr->data_size, *(pkg->data_size));

			DMERR("Insufficient space to receive package [%u] (%u vs %zu)",

			      tfr->request_type, tfr->data_size, *(pkg->data_size));



			*(pkg->data_size) = 0;

			pkg->error = -ENOSPC;

drivers/md/dm-log.c

+1 −2
Original line number Diff line number Diff line
@@ -389,8 +389,7 @@ static int create_log_context(struct dm_dirty_log *log, struct dm_target *ti, 
		else if (!strcmp(argv[1], "nosync"))

			sync = NOSYNC;

		else {

			DMWARN("unrecognised sync argument to "

			       "dirty region log: %s", argv[1]);

			DMWARN("unrecognised sync argument to dirty region log: %s", argv[1]);

			return -EINVAL;

		}

	}

drivers/md/dm-raid1.c

+3 −4
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type) 
		 * Better to issue requests to same failing device

		 * than to risk returning corrupt data.

		 */

		DMERR("Primary mirror (%s) failed while out-of-sync: "

		      "Reads may fail.", m->dev->name);

		DMERR("Primary mirror (%s) failed while out-of-sync: Reads may fail.",

		      m->dev->name);

		goto out;

	}
@@ -526,8 +526,7 @@ static void read_callback(unsigned long error, void *context) 
	fail_mirror(m, DM_RAID1_READ_ERROR);



	if (likely(default_ok(m)) || mirror_available(m->ms, bio)) {

		DMWARN_LIMIT("Read failure on mirror device %s.  "

			     "Trying alternative device.",

		DMWARN_LIMIT("Read failure on mirror device %s. Trying alternative device.",

			     m->dev->name);

		queue_bio(m->ms, bio, bio_data_dir(bio));

		return;