From 6f583c100728a230b8513d3e7a7712fa82528568 Mon Sep 17 00:00:00 2001 From: PB Date: Mon, 12 Feb 2024 07:08:40 +0000 Subject: [PATCH] Revert "k6.6.4 temporary patch (#4206)" (#4237) This reverts commit c7c110911afc033df2b44b97d813c3f720f94c01. --- kernel-kit/patches/aufs_sources/apply | 7 ------- kernel-kit/patches/aufs_sources/k6.6.4.patch | 20 -------------------- 2 files changed, 27 deletions(-) delete mode 100644 kernel-kit/patches/aufs_sources/k6.6.4.patch diff --git a/kernel-kit/patches/aufs_sources/apply b/kernel-kit/patches/aufs_sources/apply index 2096347a953..bfeb882f0a2 100755 --- a/kernel-kit/patches/aufs_sources/apply +++ b/kernel-kit/patches/aufs_sources/apply @@ -42,11 +42,4 @@ if [ "$kseries" = "5.4" ] ; then fi fi -if [ "$kseries" = "6.6" ] ; then - if vercmp $kver ge 6.6.4 ; then - # temorary until aufs-6.6.4 appears - patch -N -p1 < ../patches/aufs_sources/k6.6.4.patch - fi -fi - ### END ### diff --git a/kernel-kit/patches/aufs_sources/k6.6.4.patch b/kernel-kit/patches/aufs_sources/k6.6.4.patch deleted file mode 100644 index 3795d79139d..00000000000 --- a/kernel-kit/patches/aufs_sources/k6.6.4.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c -index c3ff23f485d7..329d73968dc3 100644 ---- a/fs/aufs/i_op.c -+++ b/fs/aufs/i_op.c -@@ -1293,9 +1293,13 @@ - goto out_fill; /* pretending success */ - - positive = d_is_positive(h_path.dentry); -- if (positive) -+ if (positive) { - /* no vfsub version */ -- err = vfs_getattr(&h_path, st, request, query); -+ if (query & AT_GETATTR_NOSEC) -+ err = vfs_getattr_nosec(&h_path, st, request, query); -+ else -+ err = vfs_getattr(&h_path, st, request, query); -+ } - if (!err) { - if (positive) - au_refresh_iattr(inode, st,