All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] rbd: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
@ 2014-04-11  8:38 ` Duan Jiong
  0 siblings, 0 replies; 4+ messages in thread
From: Duan Jiong @ 2014-04-11  8:38 UTC (permalink / raw)
  To: yehuda, sage, elder, ceph-devel; +Cc: linux-kernel, Duan Jiong

This patch fixes coccinelle error regarding usage of IS_ERR and
PTR_ERR instead of PTR_ERR_OR_ZERO.

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
---
 drivers/block/rbd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4c95b50..552a2ed 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4752,7 +4752,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
 
 		image_id = ceph_extract_encoded_string(&p, p + ret,
 						NULL, GFP_NOIO);
-		ret = IS_ERR(image_id) ? PTR_ERR(image_id) : 0;
+		ret = PTR_ERR_OR_ZERO(image_id);
 		if (!ret)
 			rbd_dev->image_format = 2;
 	} else {
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH] rbd: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
@ 2014-04-11  8:38 ` Duan Jiong
  0 siblings, 0 replies; 4+ messages in thread
From: Duan Jiong @ 2014-04-11  8:38 UTC (permalink / raw)
  To: yehuda, sage, elder, ceph-devel; +Cc: linux-kernel, Duan Jiong

This patch fixes coccinelle error regarding usage of IS_ERR and
PTR_ERR instead of PTR_ERR_OR_ZERO.

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
---
 drivers/block/rbd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4c95b50..552a2ed 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4752,7 +4752,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
 
 		image_id = ceph_extract_encoded_string(&p, p + ret,
 						NULL, GFP_NOIO);
-		ret = IS_ERR(image_id) ? PTR_ERR(image_id) : 0;
+		ret = PTR_ERR_OR_ZERO(image_id);
 		if (!ret)
 			rbd_dev->image_format = 2;
 	} else {
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] rbd: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
  2014-04-11  8:38 ` Duan Jiong
  (?)
@ 2014-04-11  9:25 ` Yan, Zheng
  2014-04-11 15:17   ` Sage Weil
  -1 siblings, 1 reply; 4+ messages in thread
From: Yan, Zheng @ 2014-04-11  9:25 UTC (permalink / raw)
  To: Duan Jiong; +Cc: yehuda, Sage Weil, elder, ceph-devel, linux-kernel

On Fri, Apr 11, 2014 at 4:38 PM, Duan Jiong <duanj.fnst@cn.fujitsu.com> wrote:
> This patch fixes coccinelle error regarding usage of IS_ERR and
> PTR_ERR instead of PTR_ERR_OR_ZERO.
>
> Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
> ---
>  drivers/block/rbd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 4c95b50..552a2ed 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -4752,7 +4752,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
>
>                 image_id = ceph_extract_encoded_string(&p, p + ret,
>                                                 NULL, GFP_NOIO);
> -               ret = IS_ERR(image_id) ? PTR_ERR(image_id) : 0;
> +               ret = PTR_ERR_OR_ZERO(image_id);
>                 if (!ret)
>                         rbd_dev->image_format = 2;
>         } else {

Reviewed-by: Yan, Zheng <zheng.z.yan@intel.com>

> --
> 1.8.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] rbd: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
  2014-04-11  9:25 ` Yan, Zheng
@ 2014-04-11 15:17   ` Sage Weil
  0 siblings, 0 replies; 4+ messages in thread
From: Sage Weil @ 2014-04-11 15:17 UTC (permalink / raw)
  To: Yan, Zheng; +Cc: Duan Jiong, yehuda, elder, ceph-devel, linux-kernel

Applied, thanks!

sage

On Fri, 11 Apr 2014, Yan, Zheng wrote:

> On Fri, Apr 11, 2014 at 4:38 PM, Duan Jiong <duanj.fnst@cn.fujitsu.com> wrote:
> > This patch fixes coccinelle error regarding usage of IS_ERR and
> > PTR_ERR instead of PTR_ERR_OR_ZERO.
> >
> > Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
> > ---
> >  drivers/block/rbd.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> > index 4c95b50..552a2ed 100644
> > --- a/drivers/block/rbd.c
> > +++ b/drivers/block/rbd.c
> > @@ -4752,7 +4752,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
> >
> >                 image_id = ceph_extract_encoded_string(&p, p + ret,
> >                                                 NULL, GFP_NOIO);
> > -               ret = IS_ERR(image_id) ? PTR_ERR(image_id) : 0;
> > +               ret = PTR_ERR_OR_ZERO(image_id);
> >                 if (!ret)
> >                         rbd_dev->image_format = 2;
> >         } else {
> 
> Reviewed-by: Yan, Zheng <zheng.z.yan@intel.com>
> 
> > --
> > 1.8.3.1
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-04-11 15:17 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-11  8:38 [PATCH] rbd: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO Duan Jiong
2014-04-11  8:38 ` Duan Jiong
2014-04-11  9:25 ` Yan, Zheng
2014-04-11 15:17   ` Sage Weil

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.