* [PATCH] rbd: report unsupported features to syslog
@ 2016-04-15 19:25 Ilya Dryomov
2016-04-27 21:14 ` Josh Durgin
2016-04-28 16:42 ` Douglas Fuller
0 siblings, 2 replies; 3+ messages in thread
From: Ilya Dryomov @ 2016-04-15 19:25 UTC (permalink / raw)
To: ceph-devel
... instead of just returning an error.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---
drivers/block/rbd.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 9f1eb00b5e64..78aca585e7e5 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4184,7 +4184,7 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,
__le64 features;
__le64 incompat;
} __attribute__ ((packed)) features_buf = { 0 };
- u64 incompat;
+ u64 unsup;
int ret;
ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
@@ -4197,9 +4197,12 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,
if (ret < sizeof (features_buf))
return -ERANGE;
- incompat = le64_to_cpu(features_buf.incompat);
- if (incompat & ~RBD_FEATURES_SUPPORTED)
+ unsup = le64_to_cpu(features_buf.incompat) & ~RBD_FEATURES_SUPPORTED;
+ if (unsup) {
+ rbd_warn(rbd_dev, "image uses unsupported features: 0x%llx",
+ unsup);
return -ENXIO;
+ }
*snap_features = le64_to_cpu(features_buf.features);
--
2.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] rbd: report unsupported features to syslog
2016-04-15 19:25 [PATCH] rbd: report unsupported features to syslog Ilya Dryomov
@ 2016-04-27 21:14 ` Josh Durgin
2016-04-28 16:42 ` Douglas Fuller
1 sibling, 0 replies; 3+ messages in thread
From: Josh Durgin @ 2016-04-27 21:14 UTC (permalink / raw)
To: Ilya Dryomov, ceph-devel
On 04/15/2016 12:25 PM, Ilya Dryomov wrote:
> ... instead of just returning an error.
>
> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
> ---
> drivers/block/rbd.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 9f1eb00b5e64..78aca585e7e5 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -4184,7 +4184,7 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,
> __le64 features;
> __le64 incompat;
> } __attribute__ ((packed)) features_buf = { 0 };
> - u64 incompat;
> + u64 unsup;
> int ret;
>
> ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
> @@ -4197,9 +4197,12 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,
> if (ret < sizeof (features_buf))
> return -ERANGE;
>
> - incompat = le64_to_cpu(features_buf.incompat);
> - if (incompat & ~RBD_FEATURES_SUPPORTED)
> + unsup = le64_to_cpu(features_buf.incompat) & ~RBD_FEATURES_SUPPORTED;
> + if (unsup) {
> + rbd_warn(rbd_dev, "image uses unsupported features: 0x%llx",
> + unsup);
> return -ENXIO;
> + }
>
> *snap_features = le64_to_cpu(features_buf.features);
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] rbd: report unsupported features to syslog
2016-04-15 19:25 [PATCH] rbd: report unsupported features to syslog Ilya Dryomov
2016-04-27 21:14 ` Josh Durgin
@ 2016-04-28 16:42 ` Douglas Fuller
1 sibling, 0 replies; 3+ messages in thread
From: Douglas Fuller @ 2016-04-28 16:42 UTC (permalink / raw)
To: Ilya Dryomov; +Cc: Ceph Development
Looks good to me.
Reviewed-by: Douglas Fuller <dfuller@redhat.com>
Cheers,
—Doug
> On Apr 15, 2016, at 3:25 PM, Ilya Dryomov <idryomov@gmail.com> wrote:
>
> ... instead of just returning an error.
>
> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
> ---
> drivers/block/rbd.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 9f1eb00b5e64..78aca585e7e5 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -4184,7 +4184,7 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,
> __le64 features;
> __le64 incompat;
> } __attribute__ ((packed)) features_buf = { 0 };
> - u64 incompat;
> + u64 unsup;
> int ret;
>
> ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
> @@ -4197,9 +4197,12 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,
> if (ret < sizeof (features_buf))
> return -ERANGE;
>
> - incompat = le64_to_cpu(features_buf.incompat);
> - if (incompat & ~RBD_FEATURES_SUPPORTED)
> + unsup = le64_to_cpu(features_buf.incompat) & ~RBD_FEATURES_SUPPORTED;
> + if (unsup) {
> + rbd_warn(rbd_dev, "image uses unsupported features: 0x%llx",
> + unsup);
> return -ENXIO;
> + }
>
> *snap_features = le64_to_cpu(features_buf.features);
>
> --
> 2.4.3
>
> --
> 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] 3+ messages in thread
end of thread, other threads:[~2016-04-28 16:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-15 19:25 [PATCH] rbd: report unsupported features to syslog Ilya Dryomov
2016-04-27 21:14 ` Josh Durgin
2016-04-28 16:42 ` Douglas Fuller
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.