patches/kernel/0018-Revert-UBUNTU-SAUCE-ceph-make-sure-all-the-files-suc.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Thomas Lamprecht <t.lamprecht@proxmox.com>
   3 Date: Tue, 7 Nov 2023 09:26:16 +0100
   4 Subject: [PATCH] Revert "UBUNTU: SAUCE: ceph: make sure all the files
   5  successfully put before unmounting"
   6
   7 This reverts commit a53dba9297be9597eac7b17738723bd44bac97ea, which
   8 was an early attempt to fix a bug that was actually present in the
   9 ceph layer, as confirmed by the original patch author [0], and fixed
  10 actually there now [1].
  11
  12 [0]: https://lore.kernel.org/all/8443166a-7182-7777-a489-14b5dab20bd5@redhat.com/
  13 [1]: https://patchwork.kernel.org/project/ceph-devel/patch/20221221093031.132792-1-xiubli@redhat.com/
  14 Hide
  15
  16 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  17 ---
  18  fs/crypto/keyring.c | 6 +-----
  19  fs/inode.c          | 5 +----
  20  2 files changed, 2 insertions(+), 9 deletions(-)
  21
  22 diff --git a/fs/crypto/keyring.c b/fs/crypto/keyring.c
  23 index 147b9a11c62c..7cbb1fd872ac 100644
  24 --- a/fs/crypto/keyring.c
  25 +++ b/fs/crypto/keyring.c
  26 @@ -237,11 +237,7 @@ void fscrypt_destroy_keyring(struct super_block *sb)
  27                          * with ->mk_secret.  There should be no structural refs
  28                          * beyond the one associated with the active ref.
  29                          */
  30 -                       if (refcount_read(&mk->mk_active_refs) != 1) {
  31 -                               printk("fscrypt_destroy_keyring: mk_active_refs = %d\n",
  32 -                                      refcount_read(&mk->mk_active_refs));
  33 -                               WARN_ON_ONCE(refcount_read(&mk->mk_active_refs) != 1);
  34 -                       }
  35 +                       WARN_ON_ONCE(refcount_read(&mk->mk_active_refs) != 1);
  36                         WARN_ON_ONCE(refcount_read(&mk->mk_struct_refs) != 1);
  37                         WARN_ON_ONCE(!is_master_key_secret_present(&mk->mk_secret));
  38                         wipe_master_key_secret(&mk->mk_secret);
  39 diff --git a/fs/inode.c b/fs/inode.c
  40 index 3b8abad427b4..67611a360031 100644
  41 --- a/fs/inode.c
  42 +++ b/fs/inode.c
  43 @@ -716,11 +716,8 @@ void evict_inodes(struct super_block *sb)
  44  again:
  45         spin_lock(&sb->s_inode_list_lock);
  46         list_for_each_entry_safe(inode, next, &sb->s_inodes, i_sb_list) {
  47 -               if (atomic_read(&inode->i_count)) {
  48 -                       printk("evict_inodes inode %p, i_count = %d, was skipped!\n",
  49 -                              inode, atomic_read(&inode->i_count));
  50 +               if (atomic_read(&inode->i_count))
  51                         continue;
  52 -               }
  53
  54                 spin_lock(&inode->i_lock);
  55                 if (inode->i_state & (I_NEW | I_FREEING | I_WILL_FREE)) {