tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

rbd: remove extra newlines from rbd_warn() messages

rbd_warn() string should be a single line - rbd_warn() appends \n.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>

Ilya Dryomov 9584d508 7a716aac

+12 -13
+12 -13
drivers/block/rbd.c
··· 1370 1370 struct rbd_device *rbd_dev; 1371 1371 1372 1372 rbd_dev = obj_request->img_request->rbd_dev; 1373 - rbd_warn(rbd_dev, "obj_request %p already marked img_data\n", 1373 + rbd_warn(rbd_dev, "obj_request %p already marked img_data", 1374 1374 obj_request); 1375 1375 } 1376 1376 } ··· 1388 1388 1389 1389 if (obj_request_img_data_test(obj_request)) 1390 1390 rbd_dev = obj_request->img_request->rbd_dev; 1391 - rbd_warn(rbd_dev, "obj_request %p already marked done\n", 1391 + rbd_warn(rbd_dev, "obj_request %p already marked done", 1392 1392 obj_request); 1393 1393 } 1394 1394 } ··· 1779 1779 rbd_osd_trivial_callback(obj_request); 1780 1780 break; 1781 1781 default: 1782 - rbd_warn(NULL, "%s: unsupported op %hu\n", 1782 + rbd_warn(NULL, "%s: unsupported op %hu", 1783 1783 obj_request->object_name, (unsigned short) opcode); 1784 1784 break; 1785 1785 } ··· 2014 2014 if (!counter) 2015 2015 rbd_dev_unparent(rbd_dev); 2016 2016 else 2017 - rbd_warn(rbd_dev, "parent reference underflow\n"); 2017 + rbd_warn(rbd_dev, "parent reference underflow"); 2018 2018 } 2019 2019 2020 2020 /* ··· 2044 2044 /* Image was flattened, but parent is not yet torn down */ 2045 2045 2046 2046 if (counter < 0) 2047 - rbd_warn(rbd_dev, "parent reference overflow\n"); 2047 + rbd_warn(rbd_dev, "parent reference overflow"); 2048 2048 2049 2049 return false; 2050 2050 } ··· 2177 2177 if (result) { 2178 2178 struct rbd_device *rbd_dev = img_request->rbd_dev; 2179 2179 2180 - rbd_warn(rbd_dev, "%s %llx at %llx (%llx)\n", 2180 + rbd_warn(rbd_dev, "%s %llx at %llx (%llx)", 2181 2181 img_request_write_test(img_request) ? "write" : "read", 2182 2182 obj_request->length, obj_request->img_offset, 2183 2183 obj_request->offset); 2184 - rbd_warn(rbd_dev, " result %d xferred %x\n", 2184 + rbd_warn(rbd_dev, " result %d xferred %x", 2185 2185 result, xferred); 2186 2186 if (!img_request->result) 2187 2187 img_request->result = result; ··· 2971 2971 */ 2972 2972 ret = rbd_dev_refresh(rbd_dev); 2973 2973 if (ret) 2974 - rbd_warn(rbd_dev, "refresh failed: %d\n", ret); 2974 + rbd_warn(rbd_dev, "refresh failed: %d", ret); 2975 2975 2976 2976 ret = rbd_obj_notify_ack_sync(rbd_dev, notify_id); 2977 2977 if (ret) 2978 - rbd_warn(rbd_dev, "notify_ack ret %d\n", ret); 2978 + rbd_warn(rbd_dev, "notify_ack ret %d", ret); 2979 2979 } 2980 2980 2981 2981 /* ··· 4091 4091 4092 4092 ret = -EIO; 4093 4093 if (pool_id > (u64)U32_MAX) { 4094 - rbd_warn(NULL, "parent pool id too large (%llu > %u)\n", 4094 + rbd_warn(NULL, "parent pool id too large (%llu > %u)", 4095 4095 (unsigned long long)pool_id, U32_MAX); 4096 4096 goto out_err; 4097 4097 } ··· 4144 4144 * overlap is zero we just pretend there was 4145 4145 * no parent image. 4146 4146 */ 4147 - rbd_warn(rbd_dev, "ignoring parent of " 4148 - "clone with overlap 0\n"); 4147 + rbd_warn(rbd_dev, "ignoring parent with overlap 0"); 4149 4148 } 4150 4149 } 4151 4150 out: ··· 5283 5284 /* The ceph file layout needs to fit pool id in 32 bits */ 5284 5285 5285 5286 if (spec->pool_id > (u64)U32_MAX) { 5286 - rbd_warn(NULL, "pool id too large (%llu > %u)\n", 5287 + rbd_warn(NULL, "pool id too large (%llu > %u)", 5287 5288 (unsigned long long)spec->pool_id, U32_MAX); 5288 5289 rc = -EIO; 5289 5290 goto err_out_client;