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,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 08778C43603 for ; Thu, 19 Dec 2019 19:02:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C74A5206EC for ; Thu, 19 Dec 2019 19:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576782160; bh=YZq17bvqHn0RDecNk9gGgHoIlYXiGXKbQkcatew4jYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=M/PzeBRzi9Qj5ZOSACe2j/gC8BJxFfy8fJlPGNVe/9tNwVQ3D+43OHrmR/T2MPE1M 4kqy01L1SUePteJi2LoR4L/2iI9uTj0F4Z5ox4Vg/FCro/DbtUtz+z0sgotgaFxuxA JcHJM3DDYjUnnINqhHoc7Zgq/IJPdaNWjAPGfVTw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729766AbfLSStV (ORCPT ); Thu, 19 Dec 2019 13:49:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:42730 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729763AbfLSStU (ORCPT ); Thu, 19 Dec 2019 13:49:20 -0500 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 E4F352465E; Thu, 19 Dec 2019 18:49:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781359; bh=YZq17bvqHn0RDecNk9gGgHoIlYXiGXKbQkcatew4jYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wkECLASr+dvr9WAJUbMK6RoiDLia7099fT2m7zRrs7gvFLc7PFAcmrKpUI2hTzFt9 BJIeEmzoQi7vd0z1k9fpAdBRwfGVxvTHdJ33I+hbfo7hpil2plcd9l5kjNyMce4UfK MHUVvTLDdjfBsrpReE1Yj9p7DKhT7ogawZtF/HMo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Shilovsky , Steve French Subject: [PATCH 4.9 189/199] CIFS: Respect O_SYNC and O_DIRECT flags during reconnect Date: Thu, 19 Dec 2019 19:34:31 +0100 Message-Id: <20191219183226.185939265@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183214.629503389@linuxfoundation.org> References: <20191219183214.629503389@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pavel Shilovsky commit 44805b0e62f15e90d233485420e1847133716bdc upstream. Currently the client translates O_SYNC and O_DIRECT flags into corresponding SMB create options when openning a file. The problem is that on reconnect when the file is being re-opened the client doesn't set those flags and it causes a server to reject re-open requests because create options don't match. The latter means that any subsequent system call against that open file fail until a share is re-mounted. Fix this by properly setting SMB create options when re-openning files after reconnects. Fixes: 1013e760d10e6: ("SMB3: Don't ignore O_SYNC/O_DSYNC and O_DIRECT flags") Cc: Stable Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/cifs/file.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -722,6 +722,13 @@ cifs_reopen_file(struct cifsFileInfo *cf if (backup_cred(cifs_sb)) create_options |= CREATE_OPEN_BACKUP_INTENT; + /* O_SYNC also has bit for O_DSYNC so following check picks up either */ + if (cfile->f_flags & O_SYNC) + create_options |= CREATE_WRITE_THROUGH; + + if (cfile->f_flags & O_DIRECT) + create_options |= CREATE_NO_BUFFER; + if (server->ops->get_lease_key) server->ops->get_lease_key(inode, &cfile->fid);