From patchwork Sat Mar 9 04:25:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1909913 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ts92S010pz1yXB for ; Sat, 9 Mar 2024 15:25:51 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rioHE-0007Rh-79; Sat, 09 Mar 2024 04:25:40 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rioH6-0007QF-8G for kernel-team@lists.ubuntu.com; Sat, 09 Mar 2024 04:25:32 +0000 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id D42063F280 for ; Sat, 9 Mar 2024 04:25:31 +0000 (UTC) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-68f75058f07so17785766d6.0 for ; Fri, 08 Mar 2024 20:25:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709958330; x=1710563130; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BYISnA4vLi7d3/aiCMUeaFXERiMB+ckcLQjSqrdNjL0=; b=L6XarntI4FR5U/RHkDk/IKQxLXbdC4xhVDiS3MVbxZVZAP90L6mSICZTu3t7GFKmWM 10m9nAY1d+D4K0xYTu3sXod0033G4T/F6+NcFgCZ7SFFchf8Ra8L1bMw39nva84DjSSR QVbuWBTiPndiA6sNcak+TiBPjvyhA46EWxEgghAedlzp+JfF5FTPplCtdHsPscjxATsy mXktIkQDatSbxokNBitv8jLksTCMm3tTQpwjlXXChOFWk/RAAu4KwL4wycCG2hdSMXyW lfctaYbFNdHbKgOB6oATHlqslGVgsSgg9Wlecyg7Ix8mvSrH8Qy2/L7vf5kdKKB779+y 7/YA== X-Gm-Message-State: AOJu0YzH993j3C/Z2AKtQZpGkb9J7beIapv8xCOIh3eJNwya60mWA+zO JbWYKVtYEaLivisBCCPrbWV3+2h2I+HI5WrjRIaUEIC4W8Vc6/Hg/aHS6mw+UVQ5QwEkpr8Kf5n rU08lf4nvuGkXS/f975lZbNRHEpz5XDqmavv8bFoxZo7bNVMj2gY+r9caf/A9kOWPLaMMFANfkM so2eM72avgXg== X-Received: by 2002:a05:6214:420a:b0:68f:dddb:747 with SMTP id nd10-20020a056214420a00b0068fdddb0747mr951202qvb.58.1709958330721; Fri, 08 Mar 2024 20:25:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IGG12cjaQSM2Tbje0NI2/Uy20Lw42r2lzbe1JZ3FA2bQZXptz3OvlGpbzm/fApj+ObQNniDOA== X-Received: by 2002:a05:6214:420a:b0:68f:dddb:747 with SMTP id nd10-20020a056214420a00b0068fdddb0747mr951195qvb.58.1709958330427; Fri, 08 Mar 2024 20:25:30 -0800 (PST) Received: from smtp.gmail.com (h208-73-92-250.mdtnwi.broadband.dynamic.tds.net. [208.73.92.250]) by smtp.gmail.com with ESMTPSA id mn20-20020a0562145ed400b0069030a44682sm492040qvb.110.2024.03.08.20.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 20:25:30 -0800 (PST) From: John Cabaj To: kernel-team@lists.ubuntu.com Subject: [SRU][noble:linux][PATCH 1/1] Revert "UBUNTU: SAUCE: ceph: make sure all the files successfully put before unmounting" Date: Fri, 8 Mar 2024 22:25:27 -0600 Message-Id: <20240309042527.630804-2-john.cabaj@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240309042527.630804-1-john.cabaj@canonical.com> References: <20240309042527.630804-1-john.cabaj@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: johncabaj@outlook.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2056616 This reverts commit 603b74b4176fdf6ab2fb83306136947296e7aeb4. Signed-off-by: John Cabaj --- fs/crypto/keyring.c | 6 +----- fs/inode.c | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) 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)) {