Drop smb3-fix-caching-of-ctime-on-setxattr.patch-25511

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/series b/queue-5.15/series
index d274f824944febca074e5941fee5e64b9d709c36..a967b6042060dc61b24cf918c8032badb8af2c8f 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -62,7 +62,6 @@ cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch
 iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch
 iommu-vt-d-make-context-clearing-consistent-with-con.patch
 smb3-fix-touch-h-of-symlink.patch-27885
-smb3-fix-caching-of-ctime-on-setxattr.patch-25511
 cpufreq-imx6q-don-t-warn-for-disabling-a-non-existin.patch-28374
 cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-21745
 iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch-28521

diff --git a/queue-5.15/smb3-fix-caching-of-ctime-on-setxattr.patch-25511 b/queue-5.15/smb3-fix-caching-of-ctime-on-setxattr.patch-25511
deleted file mode 100644 (file)
index a9b7905..0000000
--- a/queue-5.15/smb3-fix-caching-of-ctime-on-setxattr.patch-25511
+++ /dev/null
@@ -1,43 +0,0 @@
-From 093384d22a09f364bccddcf1ada2ac154087db60 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 7 Nov 2023 21:38:13 -0600
-Subject: smb3: fix caching of ctime on setxattr
-
-From: Steve French <stfrench@microsoft.com>
-
-[ Upstream commit 5923d6686a100c2b4cabd4c2ca9d5a12579c7614 ]
-
-Fixes xfstest generic/728 which had been failing due to incorrect
-ctime after setxattr and removexattr
-
-Update ctime on successful set of xattr
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Steve French <stfrench@microsoft.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/cifs/xattr.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c
-index 9d486fbbfbbde..6f719b9cf9e9e 100644
---- a/fs/cifs/xattr.c
-+++ b/fs/cifs/xattr.c
-@@ -150,10 +150,13 @@ static int cifs_xattr_set(const struct xattr_handler *handler,
-               if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)
-                       goto out;
- 
--              if (pTcon->ses->server->ops->set_EA)
-+              if (pTcon->ses->server->ops->set_EA) {
-                       rc = pTcon->ses->server->ops->set_EA(xid, pTcon,
-                               full_path, name, value, (__u16)size,
-                               cifs_sb->local_nls, cifs_sb);
-+                      if (rc == 0)
-+                              inode_set_ctime_current(inode);
-+              }
-               break;
- 
-       case XATTR_CIFS_ACL:
--- 
-2.42.0
-