Drop bcachefs-fix-missing-bch2_err_class-calls.patch

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

diff --git a/queue-6.7/bcachefs-fix-missing-bch2_err_class-calls.patch b/queue-6.7/bcachefs-fix-missing-bch2_err_class-calls.patch
deleted file mode 100644 (file)
index aff7c5e..0000000
--- a/queue-6.7/bcachefs-fix-missing-bch2_err_class-calls.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From de3b6d7204d5b307d97e8f20ad03a21c59dfe89d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 9 Feb 2024 18:34:05 -0500
-Subject: bcachefs: Fix missing bch2_err_class() calls
-
-From: Kent Overstreet <kent.overstreet@linux.dev>
-
-[ Upstream commit 1a1c93e7f8141749ecb10165a95e95ad484bb85f ]
-
-We aren't supposed to be leaking our private error codes outside of
-fs/bcachefs/.
-
-Fixes:
-Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/bcachefs/fs.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
-index 49da8db1d9e9..b3d2fe4377b1 100644
---- a/fs/bcachefs/fs.c
-+++ b/fs/bcachefs/fs.c
-@@ -435,7 +435,7 @@ static int bch2_link(struct dentry *old_dentry, struct inode *vdir,
-               bch2_subvol_is_ro(c, inode->ei_subvol) ?:
-               __bch2_link(c, inode, dir, dentry);
-       if (unlikely(ret))
--              return ret;
-+              return bch2_err_class(ret);
- 
-       ihold(&inode->v);
-       d_instantiate(dentry, &inode->v);
-@@ -487,8 +487,9 @@ static int bch2_unlink(struct inode *vdir, struct dentry *dentry)
-       struct bch_inode_info *dir= to_bch_ei(vdir);
-       struct bch_fs *c = dir->v.i_sb->s_fs_info;
- 
--      return bch2_subvol_is_ro(c, dir->ei_subvol) ?:
-+      int ret = bch2_subvol_is_ro(c, dir->ei_subvol) ?:
-               __bch2_unlink(vdir, dentry, false);
-+      return bch2_err_class(ret);
- }
- 
- static int bch2_symlink(struct mnt_idmap *idmap,
-@@ -523,7 +524,7 @@ static int bch2_symlink(struct mnt_idmap *idmap,
-       return 0;
- err:
-       iput(&inode->v);
--      return ret;
-+      return bch2_err_class(ret);
- }
- 
- static int bch2_mkdir(struct mnt_idmap *idmap,
-@@ -641,7 +642,7 @@ static int bch2_rename2(struct mnt_idmap *idmap,
-                          src_inode,
-                          dst_inode);
- 
--      return ret;
-+      return bch2_err_class(ret);
- }
- 
- static void bch2_setattr_copy(struct mnt_idmap *idmap,
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 84fae78c4dacdebbe4e9c443394d785ee6cd1bbf..ce9bd1f29b3f9878854d7616a70870e229d5d5dd 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -103,7 +103,6 @@ revert-kobject-remove-redundant-checks-for-whether-k.patch
 pci-fix-active-state-requirement-in-pme-polling.patch
 iio-adc-ad4130-zero-initialize-clock-init-data.patch
 iio-adc-ad4130-only-set-gpio_ctrl-if-pin-is-unused.patch
-bcachefs-fix-missing-bch2_err_class-calls.patch
 cifs-fix-underflow-in-parse_server_interfaces.patch
 i2c-qcom-geni-correct-i2c-tre-sequence.patch
 irqchip-loongson-eiointc-use-correct-struct-type-in-.patch