Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2018-07-31 16:32:47 +0200
committerHannes Reinecke <hare@suse.de>2018-08-02 12:37:32 +0200
commit0d43d1b4ba12e9cf065e53566785f26c0379f18b (patch)
treea3c324193ee517589eb8c6cea15276711f9012b4
parentb2dd54b45a42216692c70cdb98c86eb52aa0d43d (diff)
nvmet: kABI fixes for ANA support (bsc#1054245).
-rw-r--r--patches.kabi/nvmet-kABI-fixes-for-ANA-support.patch72
-rw-r--r--series.conf1
2 files changed, 73 insertions, 0 deletions
diff --git a/patches.kabi/nvmet-kABI-fixes-for-ANA-support.patch b/patches.kabi/nvmet-kABI-fixes-for-ANA-support.patch
new file mode 100644
index 0000000000..8e4342607c
--- /dev/null
+++ b/patches.kabi/nvmet-kABI-fixes-for-ANA-support.patch
@@ -0,0 +1,72 @@
+From: Hannes Reinecke <hare@suse.de>
+Date: Tue, 31 Jul 2018 16:29:21 +0200
+Subject: [PATCH] nvmet: kABI fixes for ANA support
+References: bsc#1054245
+Patch-Mainline: never, kABI fix
+
+Guard additional fields for ANA support to avoid kABI breakage.
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ drivers/nvme/target/nvmet.h | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
+index 6ff4adf1ce39..0239492fa672 100644
+--- a/drivers/nvme/target/nvmet.h
++++ b/drivers/nvme/target/nvmet.h
+@@ -62,7 +62,6 @@ struct nvmet_ns {
+ loff_t size;
+ u8 nguid[16];
+ uuid_t uuid;
+- u32 anagrpid;
+
+ bool enabled;
+ struct nvmet_subsys *subsys;
+@@ -72,6 +71,9 @@ struct nvmet_ns {
+ struct config_group group;
+
+ struct completion disable_done;
++#ifndef __GENKSYMS__
++ u32 anagrpid;
++#endif
+ };
+
+ static inline struct nvmet_ns *to_nvmet_ns(struct config_item *item)
+@@ -123,11 +125,13 @@ struct nvmet_port {
+ struct list_head subsystems;
+ struct config_group referrals_group;
+ struct list_head referrals;
++ void *priv;
++ bool enabled;
++#ifndef __GENKSYMS__
+ struct config_group ana_groups_group;
+ struct nvmet_ana_group ana_default_group;
+ enum nvme_ana_state *ana_state;
+- void *priv;
+- bool enabled;
++#endif
+ };
+
+ static inline struct nvmet_port *to_nvmet_port(struct config_item *item)
+@@ -189,7 +193,6 @@ struct nvmet_subsys {
+ struct kref ref;
+
+ struct list_head namespaces;
+- unsigned int nr_namespaces;
+ unsigned int max_nsid;
+
+ struct list_head ctrls;
+@@ -207,6 +210,9 @@ struct nvmet_subsys {
+
+ struct config_group namespaces_group;
+ struct config_group allowed_hosts_group;
++#ifndef __GENKSYMS__
++ unsigned int nr_namespaces;
++#endif
+ };
+
+ static inline struct nvmet_subsys *to_subsys(struct config_item *item)
+--
+2.12.3
+
diff --git a/series.conf b/series.conf
index 78a1cee463..68c6de98e2 100644
--- a/series.conf
+++ b/series.conf
@@ -15916,6 +15916,7 @@
patches.kabi/nvme-partially-revert-nvme-remove-nvme_req_needs_fai.patch
patches.kabi/nvme-kABI-fix-for-ANA-support-in-nvme_ctrl.patch
patches.kabi/nvme-guard-additional-fields-in-nvme-command-structu.patch
+ patches.kabi/nvmet-kABI-fixes-for-ANA-support.patch
patches.kabi/rtlwifi-deferred-work-kabi-fix.patch
patches.kabi/of-device-kabi-fix.patch