drop ceph-make-members-in-struct-ceph_mds_request_args_ex.patch

diff --git a/queue-5.15/ceph-make-members-in-struct-ceph_mds_request_args_ex.patch b/queue-5.15/ceph-make-members-in-struct-ceph_mds_request_args_ex.patch
deleted file mode 100644 (file)
index 8a76f12..0000000
--- a/queue-5.15/ceph-make-members-in-struct-ceph_mds_request_args_ex.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 0bbf544078cff4a33e950ab0f01a6802789a240d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 Jul 2023 09:44:40 +0800
-Subject: ceph: make members in struct ceph_mds_request_args_ext a union
-
-From: Xiubo Li <xiubli@redhat.com>
-
-[ Upstream commit 3af5ae22030cb59fab4fba35f5a2b62f47e14df9 ]
-
-In ceph mainline it will allow to set the btime in the setattr request
-and just add a 'btime' member in the union 'ceph_mds_request_args' and
-then bump up the header version to 4. That means the total size of union
-'ceph_mds_request_args' will increase sizeof(struct ceph_timespec) bytes,
-but in kclient it will increase the sizeof(setattr_ext) bytes for each
-request.
-
-Since the MDS will always depend on the header's vesion and front_len
-members to decode the 'ceph_mds_request_head' struct, at the same time
-kclient hasn't supported the 'btime' feature yet in setattr request,
-so it's safe to do this change here.
-
-This will save 48 bytes memories for each request.
-
-Fixes: 4f1ddb1ea874 ("ceph: implement updated ceph_mds_request_head structure")
-Signed-off-by: Xiubo Li <xiubli@redhat.com>
-Reviewed-by: Milind Changire <mchangir@redhat.com>
-Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/ceph/ceph_fs.h | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
-index bc2699feddbeb..8038279a14fa0 100644
---- a/include/linux/ceph/ceph_fs.h
-+++ b/include/linux/ceph/ceph_fs.h
-@@ -459,17 +459,19 @@ union ceph_mds_request_args {
- } __attribute__ ((packed));
- 
- union ceph_mds_request_args_ext {
--      union ceph_mds_request_args old;
--      struct {
--              __le32 mode;
--              __le32 uid;
--              __le32 gid;
--              struct ceph_timespec mtime;
--              struct ceph_timespec atime;
--              __le64 size, old_size;       /* old_size needed by truncate */
--              __le32 mask;                 /* CEPH_SETATTR_* */
--              struct ceph_timespec btime;
--      } __attribute__ ((packed)) setattr_ext;
-+      union {
-+              union ceph_mds_request_args old;
-+              struct {
-+                      __le32 mode;
-+                      __le32 uid;
-+                      __le32 gid;
-+                      struct ceph_timespec mtime;
-+                      struct ceph_timespec atime;
-+                      __le64 size, old_size;       /* old_size needed by truncate */
-+                      __le32 mask;                 /* CEPH_SETATTR_* */
-+                      struct ceph_timespec btime;
-+              } __attribute__ ((packed)) setattr_ext;
-+      };
- };
- 
- #define CEPH_MDS_FLAG_REPLAY          1 /* this is a replayed op */
--- 
-2.40.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index be77d19207ba6457629b27e1675360312beb2053..ebca2fb2702aed1c4db36b158a5524017a29ffe8 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -428,7 +428,6 @@ ipv4-annotate-data-races-around-fi-fib_dead.patch
 net-read-sk-sk_family-once-in-sk_mc_loop.patch
 net-fib-avoid-warn-splat-in-flow-dissector.patch
 xsk-fix-xsk_diag-use-after-free-error-during-socket-.patch
-ceph-make-members-in-struct-ceph_mds_request_args_ex.patch
 drm-i915-gvt-drop-unused-helper-intel_vgpu_reset_gtt.patch
 ipv4-ignore-dst-hint-for-multipath-routes.patch
 igb-disable-virtualization-features-on-82580.patch

diff --git a/queue-6.1/ceph-make-members-in-struct-ceph_mds_request_args_ex.patch b/queue-6.1/ceph-make-members-in-struct-ceph_mds_request_args_ex.patch
deleted file mode 100644 (file)
index fbc2f62..0000000
--- a/queue-6.1/ceph-make-members-in-struct-ceph_mds_request_args_ex.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 314d428acfd80bf54132205b4d354d6c7a883479 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 Jul 2023 09:44:40 +0800
-Subject: ceph: make members in struct ceph_mds_request_args_ext a union
-
-From: Xiubo Li <xiubli@redhat.com>
-
-[ Upstream commit 3af5ae22030cb59fab4fba35f5a2b62f47e14df9 ]
-
-In ceph mainline it will allow to set the btime in the setattr request
-and just add a 'btime' member in the union 'ceph_mds_request_args' and
-then bump up the header version to 4. That means the total size of union
-'ceph_mds_request_args' will increase sizeof(struct ceph_timespec) bytes,
-but in kclient it will increase the sizeof(setattr_ext) bytes for each
-request.
-
-Since the MDS will always depend on the header's vesion and front_len
-members to decode the 'ceph_mds_request_head' struct, at the same time
-kclient hasn't supported the 'btime' feature yet in setattr request,
-so it's safe to do this change here.
-
-This will save 48 bytes memories for each request.
-
-Fixes: 4f1ddb1ea874 ("ceph: implement updated ceph_mds_request_head structure")
-Signed-off-by: Xiubo Li <xiubli@redhat.com>
-Reviewed-by: Milind Changire <mchangir@redhat.com>
-Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/ceph/ceph_fs.h | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
-index 49586ff261520..b4fa2a25b7d95 100644
---- a/include/linux/ceph/ceph_fs.h
-+++ b/include/linux/ceph/ceph_fs.h
-@@ -462,17 +462,19 @@ union ceph_mds_request_args {
- } __attribute__ ((packed));
- 
- union ceph_mds_request_args_ext {
--      union ceph_mds_request_args old;
--      struct {
--              __le32 mode;
--              __le32 uid;
--              __le32 gid;
--              struct ceph_timespec mtime;
--              struct ceph_timespec atime;
--              __le64 size, old_size;       /* old_size needed by truncate */
--              __le32 mask;                 /* CEPH_SETATTR_* */
--              struct ceph_timespec btime;
--      } __attribute__ ((packed)) setattr_ext;
-+      union {
-+              union ceph_mds_request_args old;
-+              struct {
-+                      __le32 mode;
-+                      __le32 uid;
-+                      __le32 gid;
-+                      struct ceph_timespec mtime;
-+                      struct ceph_timespec atime;
-+                      __le64 size, old_size;       /* old_size needed by truncate */
-+                      __le32 mask;                 /* CEPH_SETATTR_* */
-+                      struct ceph_timespec btime;
-+              } __attribute__ ((packed)) setattr_ext;
-+      };
- };
- 
- #define CEPH_MDS_FLAG_REPLAY          1 /* this is a replayed op */
--- 
-2.40.1
-

diff --git a/queue-6.1/series b/queue-6.1/series
index b6d411a9aeb2dadd1dd9a2bf0ff274b4a3a9be46..63aa443b88f6e9b8d1277b994d5a3062dbf84ce9 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -90,7 +90,6 @@ ipv4-annotate-data-races-around-fi-fib_dead.patch
 net-read-sk-sk_family-once-in-sk_mc_loop.patch
 net-fib-avoid-warn-splat-in-flow-dissector.patch
 xsk-fix-xsk_diag-use-after-free-error-during-socket-.patch
-ceph-make-members-in-struct-ceph_mds_request_args_ex.patch
 drm-i915-gvt-verify-pfn-is-valid-before-dereferencin.patch
 drm-i915-gvt-put-the-page-reference-obtained-by-kvm-.patch
 drm-i915-gvt-drop-unused-helper-intel_vgpu_reset_gtt.patch

diff --git a/queue-6.5/ceph-make-members-in-struct-ceph_mds_request_args_ex.patch b/queue-6.5/ceph-make-members-in-struct-ceph_mds_request_args_ex.patch
deleted file mode 100644 (file)
index 1711d48..0000000
--- a/queue-6.5/ceph-make-members-in-struct-ceph_mds_request_args_ex.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 7a622f53197ef6379dc758dccf2bccd62557f1ae Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 Jul 2023 09:44:40 +0800
-Subject: ceph: make members in struct ceph_mds_request_args_ext a union
-
-From: Xiubo Li <xiubli@redhat.com>
-
-[ Upstream commit 3af5ae22030cb59fab4fba35f5a2b62f47e14df9 ]
-
-In ceph mainline it will allow to set the btime in the setattr request
-and just add a 'btime' member in the union 'ceph_mds_request_args' and
-then bump up the header version to 4. That means the total size of union
-'ceph_mds_request_args' will increase sizeof(struct ceph_timespec) bytes,
-but in kclient it will increase the sizeof(setattr_ext) bytes for each
-request.
-
-Since the MDS will always depend on the header's vesion and front_len
-members to decode the 'ceph_mds_request_head' struct, at the same time
-kclient hasn't supported the 'btime' feature yet in setattr request,
-so it's safe to do this change here.
-
-This will save 48 bytes memories for each request.
-
-Fixes: 4f1ddb1ea874 ("ceph: implement updated ceph_mds_request_head structure")
-Signed-off-by: Xiubo Li <xiubli@redhat.com>
-Reviewed-by: Milind Changire <mchangir@redhat.com>
-Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/ceph/ceph_fs.h | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
-index 49586ff261520..b4fa2a25b7d95 100644
---- a/include/linux/ceph/ceph_fs.h
-+++ b/include/linux/ceph/ceph_fs.h
-@@ -462,17 +462,19 @@ union ceph_mds_request_args {
- } __attribute__ ((packed));
- 
- union ceph_mds_request_args_ext {
--      union ceph_mds_request_args old;
--      struct {
--              __le32 mode;
--              __le32 uid;
--              __le32 gid;
--              struct ceph_timespec mtime;
--              struct ceph_timespec atime;
--              __le64 size, old_size;       /* old_size needed by truncate */
--              __le32 mask;                 /* CEPH_SETATTR_* */
--              struct ceph_timespec btime;
--      } __attribute__ ((packed)) setattr_ext;
-+      union {
-+              union ceph_mds_request_args old;
-+              struct {
-+                      __le32 mode;
-+                      __le32 uid;
-+                      __le32 gid;
-+                      struct ceph_timespec mtime;
-+                      struct ceph_timespec atime;
-+                      __le64 size, old_size;       /* old_size needed by truncate */
-+                      __le32 mask;                 /* CEPH_SETATTR_* */
-+                      struct ceph_timespec btime;
-+              } __attribute__ ((packed)) setattr_ext;
-+      };
- };
- 
- #define CEPH_MDS_FLAG_REPLAY          1 /* this is a replayed op */
--- 
-2.40.1
-

diff --git a/queue-6.5/series b/queue-6.5/series
index 0c6d70b527113d5a027b022ac30411ebc24ac3ce..52a9a93aa80d644725360dbf2d7d05959bbfe822 100644 (file)
--- a/queue-6.5/series
+++ b/queue-6.5/series
@@ -110,7 +110,6 @@ ipv4-annotate-data-races-around-fi-fib_dead.patch
 net-read-sk-sk_family-once-in-sk_mc_loop.patch
 net-fib-avoid-warn-splat-in-flow-dissector.patch
 xsk-fix-xsk_diag-use-after-free-error-during-socket-.patch
-ceph-make-members-in-struct-ceph_mds_request_args_ex.patch
 drm-i915-gvt-verify-pfn-is-valid-before-dereferencin.patch
 drm-i915-gvt-put-the-page-reference-obtained-by-kvm-.patch
 drm-i915-gvt-drop-unused-helper-intel_vgpu_reset_gtt.patch