diff mbox series

[SRU,noble:linux,1/1] Revert "UBUNTU: SAUCE: ceph: make sure all the files successfully put before unmounting"

Message ID 20240309042527.630804-2-john.cabaj@canonical.com
State New
Headers show
Series left-over ceph debugging printks | expand

Commit Message

John Cabaj March 9, 2024, 4:25 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/2056616

This reverts commit 603b74b4176fdf6ab2fb83306136947296e7aeb4.

Signed-off-by: John Cabaj <john.cabaj@canonical.com>
---
 fs/crypto/keyring.c | 6 +-----
 fs/inode.c          | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/fs/crypto/keyring.c b/fs/crypto/keyring.c
index 1ec21f942765..0edf0b58daa7 100644
--- a/fs/crypto/keyring.c
+++ b/fs/crypto/keyring.c
@@ -249,11 +249,7 @@  void fscrypt_destroy_keyring(struct super_block *sb)
 			 * with ->mk_present.  There should be no structural
 			 * refs beyond the one associated with the active ref.
 			 */
-			if (refcount_read(&mk->mk_active_refs) != 1) {
-				printk("fscrypt_destroy_keyring: mk_active_refs = %d\n",
-				       refcount_read(&mk->mk_active_refs));
-				WARN_ON_ONCE(refcount_read(&mk->mk_active_refs) != 1);
-			}
+			WARN_ON_ONCE(refcount_read(&mk->mk_active_refs) != 1);
 			WARN_ON_ONCE(refcount_read(&mk->mk_struct_refs) != 1);
 			WARN_ON_ONCE(!mk->mk_present);
 			fscrypt_initiate_key_removal(sb, mk);
diff --git a/fs/inode.c b/fs/inode.c
index 0dfe4350161e..91048c4c9c9e 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -717,11 +717,8 @@  void evict_inodes(struct super_block *sb)
 again:
 	spin_lock(&sb->s_inode_list_lock);
 	list_for_each_entry_safe(inode, next, &sb->s_inodes, i_sb_list) {
-		if (atomic_read(&inode->i_count)) {
-			printk("evict_inodes inode %p, i_count = %d, was skipped!\n",
-			       inode, atomic_read(&inode->i_count));
+		if (atomic_read(&inode->i_count))
 			continue;
-		}
 
 		spin_lock(&inode->i_lock);
 		if (inode->i_state & (I_NEW | I_FREEING | I_WILL_FREE)) {