Re: [PATCH] xen-scsiback: use DRV_PFX in the pr macros
Hi, Juergen.
Thanks for your advice. I will send a v2 patch based on your suggested
modifications.
On 2015/3/3 17:52, Juergen Gross wrote:
On 03/03/2015 09:37 AM, Tao Chen wrote:
Replace the string of {xen-pvscsi:} in the pr sentences with DRV_PFX,
it makes the code easier to read.
I'm not really convinced this is worth a patch. OTOH I'm not completely
against it. If nobody rejects this and all my further comments are
addressed you can have my:
Acked-by: Juergen Gross jgr...@suse.com
Signed-off-by: Tao Chen boby.c...@huawei.com
---
drivers/xen/xen-scsiback.c | 67
+++---
1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 9faca6a..307100d 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -69,6 +69,7 @@
#include xen/interface/grant_table.h
#include xen/interface/io/vscsiif.h
+#define DRV_PFX xen-pvscsi:
Using xen-pvscsi: wouldn't delete the white space after the colon in
most messages.
#define DPRINTK(_f, _a...)\
pr_debug((file=%s, line=%d) _f, __FILE__ , __LINE__ , ## _a)
@@ -84,7 +85,7 @@ struct ids_tuple {
struct v2p_entry {
struct ids_tuple v;/* translate from */
-struct scsiback_tpg *tpg;/* translate to */
+struct scsiback_tpg *tpg;/* translate to */
Unrelated white space change (others as well). Either omit them or
mention them in the commit message.
unsigned int lun;
struct kref kref;
struct list_head l;
@@ -271,7 +272,7 @@ static void scsiback_print_status(char
*sense_buffer, int errors,
{
struct scsiback_tpg *tpg = pending_req-v2p-tpg;
-pr_err(xen-pvscsi[%s:%d] cmnd[0]=%02x - st=%02x msg=%02x
host=%02x drv=%02x\n,
+pr_err(DRV_PFX [%s:%d] cmnd[0]=%02x - st=%02x msg=%02x
host=%02x drv=%02x\n,
tpg-tport-tport_name, pending_req-v2p-lun,
pending_req-cmnd[0], status_byte(errors), msg_byte(errors),
host_byte(errors), driver_byte(errors));
@@ -427,7 +428,7 @@ static int scsiback_gnttab_data_map_batch(struct
gnttab_map_grant_ref *map,
BUG_ON(err);
for (i = 0; i cnt; i++) {
if (unlikely(map[i].status != GNTST_okay)) {
-pr_err(xen-pvscsi: invalid buffer -- could not remap
it\n);
+pr_err(DRV_PFX invalid buffer -- could not remap it\n);
map[i].handle = SCSIBACK_INVALID_HANDLE;
err = -ENOMEM;
} else {
@@ -449,7 +450,7 @@ static int scsiback_gnttab_data_map_list(struct
vscsibk_pend *pending_req,
for (i = 0; i cnt; i++) {
if (get_free_page(pg + mapcount)) {
put_free_pages(pg, mapcount);
-pr_err(xen-pvscsi: no grant page\n);
+pr_err(DRV_PFX no grant page\n);
return -ENOMEM;
}
gnttab_set_map_op(map[mapcount], vaddr_page(pg[mapcount]),
@@ -492,7 +493,7 @@ static int scsiback_gnttab_data_map(struct
vscsiif_request *ring_req,
return 0;
if (nr_segments VSCSIIF_SG_TABLESIZE) {
-DPRINTK(xen-pvscsi: invalid parameter nr_seg = %d\n,
+DPRINTK(DRV_PFX invalid parameter nr_seg = %d\n,
As DPRINTK already contains the file name, you can omit the prefix.
Alternatively include DRV_PFX in the DPRINTK macro.
ring_req-nr_segments);
return -EINVAL;
}
@@ -516,13 +517,13 @@ static int scsiback_gnttab_data_map(struct
vscsiif_request *ring_req,
nr_segments += n_segs;
}
if (nr_segments SG_ALL) {
-DPRINTK(xen-pvscsi: invalid nr_seg = %d\n,
+DPRINTK(DRV_PFX invalid nr_seg = %d\n,
nr_segments);
return -EINVAL;
}
}
-/* free of (sgl) in fast_flush_area()*/
+/* free of (sgl) in fast_flush_area() */
pending_req-sgl = kmalloc_array(nr_segments,
sizeof(struct scatterlist), GFP_KERNEL);
if (!pending_req-sgl)
@@ -679,7 +680,7 @@ static int prepare_pending_reqs(struct
vscsibk_info *info,
v2p = scsiback_do_translation(info, vir);
if (!v2p) {
pending_req-v2p = NULL;
-DPRINTK(xen-pvscsi: doesn't exist.\n);
+DPRINTK(DRV_PFX doesn't exist.\n);
return -ENODEV;
}
pending_req-v2p = v2p;
@@ -690,14 +691,14 @@ static int prepare_pending_reqs(struct
vscsibk_info *info,
(pending_req-sc_data_direction != DMA_TO_DEVICE)
(pending_req-sc_data_direction != DMA_FROM_DEVICE)
(pending_req-sc_data_direction != DMA_NONE)) {
-DPRINTK(xen-pvscsi: invalid parameter data_dir = %d\n,
+DPRINTK(DRV_PFX invalid parameter data_dir = %d\n,
pending_req-sc_data_direction);
return -EINVAL;
}
pending_req-cmd_len = ring_req-cmd_len;
if (pending_req-cmd_len VSCSIIF_MAX_COMMAND_SIZE) {
-DPRINTK(xen-pvscsi: invalid parameter cmd_len = %d\n,
+
Re: [PATCH] xen-scsiback: use DRV_PFX in the pr macros
On 03/03/2015 09:37 AM, Tao Chen wrote:
Replace the string of {xen-pvscsi:} in the pr sentences with DRV_PFX,
it makes the code easier to read.
I'm not really convinced this is worth a patch. OTOH I'm not completely
against it. If nobody rejects this and all my further comments are
addressed you can have my:
Acked-by: Juergen Gross jgr...@suse.com
Signed-off-by: Tao Chen boby.c...@huawei.com
---
drivers/xen/xen-scsiback.c | 67 +++---
1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 9faca6a..307100d 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -69,6 +69,7 @@
#include xen/interface/grant_table.h
#include xen/interface/io/vscsiif.h
+#define DRV_PFX xen-pvscsi:
Using xen-pvscsi: wouldn't delete the white space after the colon in
most messages.
#define DPRINTK(_f, _a...)\
pr_debug((file=%s, line=%d) _f, __FILE__ , __LINE__ , ## _a)
@@ -84,7 +85,7 @@ struct ids_tuple {
struct v2p_entry {
struct ids_tuple v; /* translate from */
- struct scsiback_tpg *tpg; /* translate to */
+ struct scsiback_tpg *tpg; /* translate to */
Unrelated white space change (others as well). Either omit them or
mention them in the commit message.
unsigned int lun;
struct kref kref;
struct list_head l;
@@ -271,7 +272,7 @@ static void scsiback_print_status(char *sense_buffer, int
errors,
{
struct scsiback_tpg *tpg = pending_req-v2p-tpg;
- pr_err(xen-pvscsi[%s:%d] cmnd[0]=%02x - st=%02x msg=%02x host=%02x
drv=%02x\n,
+ pr_err(DRV_PFX [%s:%d] cmnd[0]=%02x - st=%02x msg=%02x host=%02x
drv=%02x\n,
tpg-tport-tport_name, pending_req-v2p-lun,
pending_req-cmnd[0], status_byte(errors), msg_byte(errors),
host_byte(errors), driver_byte(errors));
@@ -427,7 +428,7 @@ static int scsiback_gnttab_data_map_batch(struct
gnttab_map_grant_ref *map,
BUG_ON(err);
for (i = 0; i cnt; i++) {
if (unlikely(map[i].status != GNTST_okay)) {
- pr_err(xen-pvscsi: invalid buffer -- could not remap
it\n);
+ pr_err(DRV_PFX invalid buffer -- could not remap
it\n);
map[i].handle = SCSIBACK_INVALID_HANDLE;
err = -ENOMEM;
} else {
@@ -449,7 +450,7 @@ static int scsiback_gnttab_data_map_list(struct
vscsibk_pend *pending_req,
for (i = 0; i cnt; i++) {
if (get_free_page(pg + mapcount)) {
put_free_pages(pg, mapcount);
- pr_err(xen-pvscsi: no grant page\n);
+ pr_err(DRV_PFX no grant page\n);
return -ENOMEM;
}
gnttab_set_map_op(map[mapcount], vaddr_page(pg[mapcount]),
@@ -492,7 +493,7 @@ static int scsiback_gnttab_data_map(struct vscsiif_request
*ring_req,
return 0;
if (nr_segments VSCSIIF_SG_TABLESIZE) {
- DPRINTK(xen-pvscsi: invalid parameter nr_seg = %d\n,
+ DPRINTK(DRV_PFX invalid parameter nr_seg = %d\n,
As DPRINTK already contains the file name, you can omit the prefix.
Alternatively include DRV_PFX in the DPRINTK macro.
ring_req-nr_segments);
return -EINVAL;
}
@@ -516,13 +517,13 @@ static int scsiback_gnttab_data_map(struct
vscsiif_request *ring_req,
nr_segments += n_segs;
}
if (nr_segments SG_ALL) {
- DPRINTK(xen-pvscsi: invalid nr_seg = %d\n,
+ DPRINTK(DRV_PFX invalid nr_seg = %d\n,
nr_segments);
return -EINVAL;
}
}
- /* free of (sgl) in fast_flush_area()*/
+ /* free of (sgl) in fast_flush_area() */
pending_req-sgl = kmalloc_array(nr_segments,
sizeof(struct scatterlist), GFP_KERNEL);
if (!pending_req-sgl)
@@ -679,7 +680,7 @@ static int prepare_pending_reqs(struct vscsibk_info *info,
v2p = scsiback_do_translation(info, vir);
if (!v2p) {
pending_req-v2p = NULL;
- DPRINTK(xen-pvscsi: doesn't exist.\n);
+ DPRINTK(DRV_PFX doesn't exist.\n);
return -ENODEV;
}
pending_req-v2p = v2p;
@@ -690,14 +691,14 @@ static int prepare_pending_reqs(struct vscsibk_info *info,
(pending_req-sc_data_direction != DMA_TO_DEVICE)
(pending_req-sc_data_direction != DMA_FROM_DEVICE)
(pending_req-sc_data_direction != DMA_NONE)) {
- DPRINTK(xen-pvscsi: invalid parameter data_dir = %d\n,
+ DPRINTK(DRV_PFX invalid parameter data_dir = %d\n,
[PATCH] xen-scsiback: use DRV_PFX in the pr macros
Replace the string of {xen-pvscsi:} in the pr sentences with DRV_PFX,
it makes the code easier to read.
Signed-off-by: Tao Chen boby.c...@huawei.com
---
drivers/xen/xen-scsiback.c | 67 +++---
1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 9faca6a..307100d 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -69,6 +69,7 @@
#include xen/interface/grant_table.h
#include xen/interface/io/vscsiif.h
+#define DRV_PFX xen-pvscsi:
#define DPRINTK(_f, _a...) \
pr_debug((file=%s, line=%d) _f, __FILE__ , __LINE__ , ## _a)
@@ -84,7 +85,7 @@ struct ids_tuple {
struct v2p_entry {
struct ids_tuple v; /* translate from */
- struct scsiback_tpg *tpg; /* translate to */
+ struct scsiback_tpg *tpg; /* translate to */
unsigned int lun;
struct kref kref;
struct list_head l;
@@ -271,7 +272,7 @@ static void scsiback_print_status(char *sense_buffer, int
errors,
{
struct scsiback_tpg *tpg = pending_req-v2p-tpg;
- pr_err(xen-pvscsi[%s:%d] cmnd[0]=%02x - st=%02x msg=%02x host=%02x
drv=%02x\n,
+ pr_err(DRV_PFX [%s:%d] cmnd[0]=%02x - st=%02x msg=%02x host=%02x
drv=%02x\n,
tpg-tport-tport_name, pending_req-v2p-lun,
pending_req-cmnd[0], status_byte(errors), msg_byte(errors),
host_byte(errors), driver_byte(errors));
@@ -427,7 +428,7 @@ static int scsiback_gnttab_data_map_batch(struct
gnttab_map_grant_ref *map,
BUG_ON(err);
for (i = 0; i cnt; i++) {
if (unlikely(map[i].status != GNTST_okay)) {
- pr_err(xen-pvscsi: invalid buffer -- could not remap
it\n);
+ pr_err(DRV_PFX invalid buffer -- could not remap
it\n);
map[i].handle = SCSIBACK_INVALID_HANDLE;
err = -ENOMEM;
} else {
@@ -449,7 +450,7 @@ static int scsiback_gnttab_data_map_list(struct
vscsibk_pend *pending_req,
for (i = 0; i cnt; i++) {
if (get_free_page(pg + mapcount)) {
put_free_pages(pg, mapcount);
- pr_err(xen-pvscsi: no grant page\n);
+ pr_err(DRV_PFX no grant page\n);
return -ENOMEM;
}
gnttab_set_map_op(map[mapcount], vaddr_page(pg[mapcount]),
@@ -492,7 +493,7 @@ static int scsiback_gnttab_data_map(struct vscsiif_request
*ring_req,
return 0;
if (nr_segments VSCSIIF_SG_TABLESIZE) {
- DPRINTK(xen-pvscsi: invalid parameter nr_seg = %d\n,
+ DPRINTK(DRV_PFX invalid parameter nr_seg = %d\n,
ring_req-nr_segments);
return -EINVAL;
}
@@ -516,13 +517,13 @@ static int scsiback_gnttab_data_map(struct
vscsiif_request *ring_req,
nr_segments += n_segs;
}
if (nr_segments SG_ALL) {
- DPRINTK(xen-pvscsi: invalid nr_seg = %d\n,
+ DPRINTK(DRV_PFX invalid nr_seg = %d\n,
nr_segments);
return -EINVAL;
}
}
- /* free of (sgl) in fast_flush_area()*/
+ /* free of (sgl) in fast_flush_area() */
pending_req-sgl = kmalloc_array(nr_segments,
sizeof(struct scatterlist), GFP_KERNEL);
if (!pending_req-sgl)
@@ -679,7 +680,7 @@ static int prepare_pending_reqs(struct vscsibk_info *info,
v2p = scsiback_do_translation(info, vir);
if (!v2p) {
pending_req-v2p = NULL;
- DPRINTK(xen-pvscsi: doesn't exist.\n);
+ DPRINTK(DRV_PFX doesn't exist.\n);
return -ENODEV;
}
pending_req-v2p = v2p;
@@ -690,14 +691,14 @@ static int prepare_pending_reqs(struct vscsibk_info *info,
(pending_req-sc_data_direction != DMA_TO_DEVICE)
(pending_req-sc_data_direction != DMA_FROM_DEVICE)
(pending_req-sc_data_direction != DMA_NONE)) {
- DPRINTK(xen-pvscsi: invalid parameter data_dir = %d\n,
+ DPRINTK(DRV_PFX invalid parameter data_dir = %d\n,
pending_req-sc_data_direction);
return -EINVAL;
}
pending_req-cmd_len = ring_req-cmd_len;
if (pending_req-cmd_len VSCSIIF_MAX_COMMAND_SIZE) {
- DPRINTK(xen-pvscsi: invalid parameter cmd_len = %d\n,
+ DPRINTK(DRV_PFX invalid parameter cmd_len = %d\n,
pending_req-cmd_len);
return -EINVAL;
}
@@ -721,7 +722,7 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info)
if (RING_REQUEST_PROD_OVERFLOW(ring, rp)) {
rc =
Re: [Xen-devel] [PATCH] xen-scsiback: use DRV_PFX in the pr macros
On 03/03/15 08:37, Tao Chen wrote:
Replace the string of {xen-pvscsi:} in the pr sentences with DRV_PFX,
it makes the code easier to read.
You need to #define pr_fmt(fmt) to add a prefix like this.
struct ids_tuple v; /* translate from */
- struct scsiback_tpg *tpg; /* translate to */
+ struct scsiback_tpg *tpg; /* translate to */
Please don't make unrelated whitespace changes.
David
--
To unsubscribe from this list: send the line unsubscribe linux-scsi in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
