From mboxrd@z Thu Jan 1 00:00:00 1970 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,URIBL_BLOCKED,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 AB852CA9EC9 for ; Mon, 4 Nov 2019 22:10:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D82F2084D for ; Mon, 4 Nov 2019 22:10:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905427; bh=hnk8VfwAow7cYuRhDBroNSThsGc48+kAJd2FwB4YOvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IUOcKAEtMmVrv3i55pQt5PZNEhJ+NrbJH/w97kwNrDKvqqkz7kLmEcwmsSMw1lWyf 7gd6TB86Y4eDL8oPnfcKYZ1bHDlynR1cs+KsEDvBJ1WnJ2ZKnOKpoznAb7X9kv/4Fm miqneuA0bVCny1vF0WRg4fTJmZUpP9DB9kBHPrcI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390537AbfKDWKZ (ORCPT ); Mon, 4 Nov 2019 17:10:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:43486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390522AbfKDWKT (ORCPT ); Mon, 4 Nov 2019 17:10:19 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (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 4B2EC20650; Mon, 4 Nov 2019 22:10:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905418; bh=hnk8VfwAow7cYuRhDBroNSThsGc48+kAJd2FwB4YOvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bSC2hclUNBiW2j4jZfGVbIhKh4Dfhpcvo4/XtaZq3O+H2lO7mz5nk2GpzLtBRulz9 AcQ+73bHThcq8NpGpXQ8T1wfXXzH0tMa5tvfSvU5adnysaVHDLBVER1o9bOclAmj8q Gm5+f/bd2+w+WanRVJE5eqretXdUdSvsZa8Csol8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miklos Szeredi Subject: [PATCH 5.3 096/163] fuse: truncate pending writes on O_TRUNC Date: Mon, 4 Nov 2019 22:44:46 +0100 Message-Id: <20191104212147.071968528@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212140.046021995@linuxfoundation.org> References: <20191104212140.046021995@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Miklos Szeredi commit e4648309b85a78f8c787457832269a8712a8673e upstream. Make sure cached writes are not reordered around open(..., O_TRUNC), with the obvious wrong results. Fixes: 4d99ff8f12eb ("fuse: Turn writeback cache on") Cc: # v3.15+ Signed-off-by: Miklos Szeredi Signed-off-by: Greg Kroah-Hartman --- fs/fuse/file.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -201,7 +201,7 @@ int fuse_open_common(struct inode *inode { struct fuse_conn *fc = get_fuse_conn(inode); int err; - bool lock_inode = (file->f_flags & O_TRUNC) && + bool is_wb_truncate = (file->f_flags & O_TRUNC) && fc->atomic_o_trunc && fc->writeback_cache; @@ -209,16 +209,20 @@ int fuse_open_common(struct inode *inode if (err) return err; - if (lock_inode) + if (is_wb_truncate) { inode_lock(inode); + fuse_set_nowrite(inode); + } err = fuse_do_open(fc, get_node_id(inode), file, isdir); if (!err) fuse_finish_open(inode, file); - if (lock_inode) + if (is_wb_truncate) { + fuse_release_nowrite(inode); inode_unlock(inode); + } return err; }