From patchwork Tue Mar 17 10:55:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229315 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3073DC18E5B for ; Tue, 17 Mar 2020 11:05:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 076C0206EC for ; Tue, 17 Mar 2020 11:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443156; bh=qj738WDBC0aPmVgUGzbHzuFqg5rI+Vr66qfUowkVNMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XJ4WgB1wWgaT3eq3QV3zKFikrIUUOKLidvstJqKjfObqByGuho2BS5N1lzxtQ74Zn t669yTrsr1b4phxkf40QZsju1A6jw3KVObRAWnp2eZwTGsFL9hXTDejOEAKlhfeobW OnfJCEbHA+vqHVeWVt6lEUBd97ZoZASp0pUe2AWs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728104AbgCQLFv (ORCPT ); Tue, 17 Mar 2020 07:05:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:46728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728467AbgCQLFu (ORCPT ); Tue, 17 Mar 2020 07:05:50 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B6BAA20714; Tue, 17 Mar 2020 11:05:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443150; bh=qj738WDBC0aPmVgUGzbHzuFqg5rI+Vr66qfUowkVNMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w4SEQjtoUXPD7gR6DgdQwn/q0Sw41oO3tZTSsxqH2yFbdvh/9hxeW323USMr+wvpw hdRxOwT/yLd0uY3BTWkdMzX71JUzfe1Gn8IBKWwBvp8MderUCCjeDi/mKV92Hcikf+ WKuhD7nVjCacoGjHC20PnhRPXNTzHqDZdBTIajGM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Al Viro , stable@kernel.org Subject: [PATCH 5.4 076/123] gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcache Date: Tue, 17 Mar 2020 11:55:03 +0100 Message-Id: <20200317103315.238827226@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103307.343627747@linuxfoundation.org> References: <20200317103307.343627747@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Al Viro commit 21039132650281de06a169cbe8a0f7e5c578fd8b upstream. with the way fs/namei.c:do_last() had been done, ->atomic_open() instances needed to recognize the case when existing file got found with O_EXCL|O_CREAT, either by falling back to finish_no_open() or failing themselves. gfs2 one didn't. Fixes: 6d4ade986f9c (GFS2: Add atomic_open support) Cc: stable@kernel.org # v3.11 Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman --- fs/gfs2/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -1248,7 +1248,7 @@ static int gfs2_atomic_open(struct inode if (!(file->f_mode & FMODE_OPENED)) return finish_no_open(file, d); dput(d); - return 0; + return excl && (flags & O_CREAT) ? -EEXIST : 0; } BUG_ON(d != NULL);