From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E84EA1537AC; Wed, 5 Feb 2025 14:11:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764687; cv=none; b=kk7HZJrFCyH6zlYpatutFPB7xwpZJjWEn4O3/GdCT9xuprTcNNSJKRKtNkgwKIQ+W31vTv9EH/wce95ghhTI7gNAPiU4lcGVSC8138Y4SaLoPmytxD5mNry2QsKPekMmrFyjVnoabhn5A9jiSAIrlovORP6SAL+dsZPZgbLcdOw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764687; c=relaxed/simple; bh=HUT5buw53I9xrLuaniY/dN65aB08hTZJ4ToAWeeKfHw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TOHH2vm/M19XOsEBqFMjOQzWwAhyxauJrNz6/0IvG8hmWo7db3Sea9DPALXiPptL9L4VVZZDfrfjwEO6X8pmZN0LM6TnSxC9vWUONKoqE+jCgUbav7STHwm71bQ+A0D7bmtITP+Xz26J9xYWOSvUp8+/7LB1doznOGcqNVjk16k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=owNgsHn2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="owNgsHn2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62BDEC4CED1; Wed, 5 Feb 2025 14:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738764686; bh=HUT5buw53I9xrLuaniY/dN65aB08hTZJ4ToAWeeKfHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=owNgsHn2SIIA0PkwDurXktKKPIBYMKtG+idZSfPhFxFAAGaxt+yQzh1U0bN+PkSls rFy0KAn+rFjrTehnjoaVnTaSVfHd2j20qa62NKuvrWshrt6etueb/kkNOlHaTGu9bf OWYX7U1cDD+5S5CpYrk/olyrxir2G3DM9nDK0Up4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Pali=20Roh=C3=A1r?= , Steve French , Sasha Levin Subject: [PATCH 6.6 193/393] cifs: Use cifs_autodisable_serverino() for disabling CIFS_MOUNT_SERVER_INUM in readdir.c Date: Wed, 5 Feb 2025 14:41:52 +0100 Message-ID: <20250205134427.679861037@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134420.279368572@linuxfoundation.org> References: <20250205134420.279368572@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pali Rohár [ Upstream commit 015683d4ed0d23698c71f2194f09bd17dbfad044 ] In all other places is used function cifs_autodisable_serverino() for disabling CIFS_MOUNT_SERVER_INUM mount flag. So use is also in readir.c _initiate_cifs_search() function. Benefit of cifs_autodisable_serverino() is that it also prints dmesg message that server inode numbers are being disabled. Fixes: ec06aedd4454 ("cifs: clean up handling when server doesn't consistently support inode numbers") Fixes: f534dc994397 ("cifs: clear server inode number flag while autodisabling") Signed-off-by: Pali Rohár Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/smb/client/readdir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/smb/client/readdir.c b/fs/smb/client/readdir.c index 3cffdf3975a21..75929a0a56f96 100644 --- a/fs/smb/client/readdir.c +++ b/fs/smb/client/readdir.c @@ -413,7 +413,7 @@ _initiate_cifs_search(const unsigned int xid, struct file *file, cifsFile->invalidHandle = false; } else if ((rc == -EOPNOTSUPP) && (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)) { - cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM; + cifs_autodisable_serverino(cifs_sb); goto ffirst_retry; } error_exit: -- 2.39.5