]>
Commit | Line | Data |
---|---|---|
f1a82baa GKH |
1 | From e573427a440fd67d3f522357d7ac901d59281948 Mon Sep 17 00:00:00 2001 |
2 | From: Ilya Dryomov <idryomov@gmail.com> | |
3 | Date: Tue, 16 Jan 2018 15:41:54 +0100 | |
4 | Subject: rbd: whitelist RBD_FEATURE_OPERATIONS feature bit | |
5 | ||
6 | From: Ilya Dryomov <idryomov@gmail.com> | |
7 | ||
8 | commit e573427a440fd67d3f522357d7ac901d59281948 upstream. | |
9 | ||
10 | This feature bit restricts older clients from performing certain | |
11 | maintenance operations against an image (e.g. clone, snap create). | |
12 | krbd does not perform maintenance operations. | |
13 | ||
14 | Cc: stable@vger.kernel.org | |
15 | Signed-off-by: Ilya Dryomov <idryomov@gmail.com> | |
16 | Reviewed-by: Jason Dillaman <dillaman@redhat.com> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
18 | ||
19 | --- | |
20 | drivers/block/rbd.c | 4 +++- | |
21 | 1 file changed, 3 insertions(+), 1 deletion(-) | |
22 | ||
23 | --- a/drivers/block/rbd.c | |
24 | +++ b/drivers/block/rbd.c | |
25 | @@ -124,11 +124,13 @@ static int atomic_dec_return_safe(atomic | |
26 | #define RBD_FEATURE_STRIPINGV2 (1ULL<<1) | |
27 | #define RBD_FEATURE_EXCLUSIVE_LOCK (1ULL<<2) | |
28 | #define RBD_FEATURE_DATA_POOL (1ULL<<7) | |
29 | +#define RBD_FEATURE_OPERATIONS (1ULL<<8) | |
30 | ||
31 | #define RBD_FEATURES_ALL (RBD_FEATURE_LAYERING | \ | |
32 | RBD_FEATURE_STRIPINGV2 | \ | |
33 | RBD_FEATURE_EXCLUSIVE_LOCK | \ | |
34 | - RBD_FEATURE_DATA_POOL) | |
35 | + RBD_FEATURE_DATA_POOL | \ | |
36 | + RBD_FEATURE_OPERATIONS) | |
37 | ||
38 | /* Features supported by this (client software) implementation. */ | |
39 |