2014-06-14 22:19:43

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 1/1] drivers/scsi/vmw_pvscsi.c: use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE

use mm.h definition

Cc: Arvind Kumar <[email protected]>
Cc: VMware PV-Drivers <[email protected]>
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/scsi/vmw_pvscsi.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index c88e146..07dc492 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -439,9 +439,9 @@ static int pvscsi_allocate_rings(struct pvscsi_adapter *adapter)
if (!adapter->cmp_ring)
return -ENOMEM;

- BUG_ON(!IS_ALIGNED(adapter->ringStatePA, PAGE_SIZE));
- BUG_ON(!IS_ALIGNED(adapter->reqRingPA, PAGE_SIZE));
- BUG_ON(!IS_ALIGNED(adapter->cmpRingPA, PAGE_SIZE));
+ BUG_ON(!PAGE_ALIGNED(adapter->ringStatePA));
+ BUG_ON(!PAGE_ALIGNED(adapter->reqRingPA));
+ BUG_ON(!PAGE_ALIGNED(adapter->cmpRingPA));

if (!adapter->use_msg)
return 0;
@@ -453,7 +453,7 @@ static int pvscsi_allocate_rings(struct pvscsi_adapter *adapter)
&adapter->msgRingPA);
if (!adapter->msg_ring)
return -ENOMEM;
- BUG_ON(!IS_ALIGNED(adapter->msgRingPA, PAGE_SIZE));
+ BUG_ON(!PAGE_ALIGNED(adapter->msgRingPA));

return 0;
}
@@ -1280,7 +1280,7 @@ static int pvscsi_allocate_sg(struct pvscsi_adapter *adapter)
ctx->sgl = (void *)__get_free_pages(GFP_KERNEL,
get_order(SGL_SIZE));
ctx->sglPA = 0;
- BUG_ON(!IS_ALIGNED(((unsigned long)ctx->sgl), PAGE_SIZE));
+ BUG_ON(!PAGE_ALIGNED((ctx->sgl)));
if (!ctx->sgl) {
for (; i >= 0; --i, --ctx) {
free_pages((unsigned long)ctx->sgl,
--
1.8.4.5


2014-06-17 20:54:32

by Arvind Kumar

[permalink] [raw]
Subject: Re: [PATCH 1/1] drivers/scsi/vmw_pvscsi.c: use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE

Thanks for the patch Fabian!

It looks fine to me. I think you should also include the emails listed by running 'scripts/get_maintainer.pl <your-patch>'.

Acked-by: Arvind Kumar <[email protected]>

Thanks!
Arvind

----- Original Message -----
From: "Fabian Frederick" <[email protected]>
To: [email protected]
Cc: "Fabian Frederick" <[email protected]>, "Arvind Kumar" <[email protected]>, "VMware PV-Drivers" <[email protected]>
Sent: Saturday, June 14, 2014 3:19:49 PM
Subject: [PATCH 1/1] drivers/scsi/vmw_pvscsi.c: use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE

use mm.h definition

Cc: Arvind Kumar <[email protected]>
Cc: VMware PV-Drivers <[email protected]>
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/scsi/vmw_pvscsi.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index c88e146..07dc492 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -439,9 +439,9 @@ static int pvscsi_allocate_rings(struct pvscsi_adapter *adapter)
if (!adapter->cmp_ring)
return -ENOMEM;

- BUG_ON(!IS_ALIGNED(adapter->ringStatePA, PAGE_SIZE));
- BUG_ON(!IS_ALIGNED(adapter->reqRingPA, PAGE_SIZE));
- BUG_ON(!IS_ALIGNED(adapter->cmpRingPA, PAGE_SIZE));
+ BUG_ON(!PAGE_ALIGNED(adapter->ringStatePA));
+ BUG_ON(!PAGE_ALIGNED(adapter->reqRingPA));
+ BUG_ON(!PAGE_ALIGNED(adapter->cmpRingPA));

if (!adapter->use_msg)
return 0;
@@ -453,7 +453,7 @@ static int pvscsi_allocate_rings(struct pvscsi_adapter *adapter)
&adapter->msgRingPA);
if (!adapter->msg_ring)
return -ENOMEM;
- BUG_ON(!IS_ALIGNED(adapter->msgRingPA, PAGE_SIZE));
+ BUG_ON(!PAGE_ALIGNED(adapter->msgRingPA));

return 0;
}
@@ -1280,7 +1280,7 @@ static int pvscsi_allocate_sg(struct pvscsi_adapter *adapter)
ctx->sgl = (void *)__get_free_pages(GFP_KERNEL,
get_order(SGL_SIZE));
ctx->sglPA = 0;
- BUG_ON(!IS_ALIGNED(((unsigned long)ctx->sgl), PAGE_SIZE));
+ BUG_ON(!PAGE_ALIGNED((ctx->sgl)));
if (!ctx->sgl) {
for (; i >= 0; --i, --ctx) {
free_pages((unsigned long)ctx->sgl,
--
1.8.4.5