| Message ID | 1397205492-24447-1-git-send-email-duanj.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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 > > -- 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
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 {
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(-)