From patchwork Wed Jun 22 20:47:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9193757 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CF14D6075C for ; Wed, 22 Jun 2016 20:48:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD0A62840B for ; Wed, 22 Jun 2016 20:48:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B221C28416; Wed, 22 Jun 2016 20:48:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 558BA2840B for ; Wed, 22 Jun 2016 20:48:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752565AbcFVUsc (ORCPT ); Wed, 22 Jun 2016 16:48:32 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:36835 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752326AbcFVUsb (ORCPT ); Wed, 22 Jun 2016 16:48:31 -0400 Received: by mail-io0-f196.google.com with SMTP id s63so9104716ioi.3 for ; Wed, 22 Jun 2016 13:48:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=ff4Lv8UTqxPe78FgxCqrJ4bMDJpa/TC7ZN+9gIQ859c=; b=WncZP6CRfFcOpfdtfNzCfDrq4/db+iRKA93yoO+8wDp8LfqA5T63Dvwsz7fcK1lt7f tJuKsItie4Tmwq9hvi+3TvscDq02QbapQAvvKCnjwBHG/xWMT2jjW/1iFtGFrpPxHU2c wOU+VYuMalrlUHUG51ARBqdwfP6euMqKuLnZW7Qv1FQC//otgkXHQ7K40SyfriLujsZc /wincrfQ6xBRHSG28+B4iOfjS/ioClHRn6oNRk56vZ2It9nrlB/0h39+HmpSfhdPNdwG QzC0Uut8thVi8cZqd9W4q+whUOvlvS7Ae0YQmwGVZ6he8rpH+C5EUBIUXz5YJ3DWpNhF VBOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=ff4Lv8UTqxPe78FgxCqrJ4bMDJpa/TC7ZN+9gIQ859c=; b=lZyDCbcEcIo0CxSSfjIpmyxEDWigDicF13j8yjMMNFb2JM9zIfP4mD/JIECZqnJ8Gz pY4yWehrQTKoX1mXXJGA4X0g6IrKjSKzcmTx++uo6971WgyxR4WBVRIZu/bGtY0cL02c DMq7s1dWxTJKDT4NKIc6i9+jlAu+GCuFYtVgtKqBRYWy2kMNv96yO9OHYnOBH5jNFgJE BaqXkxOMS7PoPXk0SoFfBeYM1t42iCIozfkhm/iFN8brHc8LuHYkgwR59b/8EIHUe1FV kgSr70GTT5r2U9ArAOGJ/0Ny+vbWWqWgb93bY/mtMWtZH+EmzBjjETyRnQdPnV0pC21g cHTw== X-Gm-Message-State: ALyK8tLko82bv42Fo95HWWMJ3FSRDL3xfNyA6Y2lLsJpoDudWCJDWQWk4b1olv2fEbF+dQ== X-Received: by 10.107.55.4 with SMTP id e4mr42858003ioa.166.1466628510615; Wed, 22 Jun 2016 13:48:30 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id m133sm1061586ioa.23.2016.06.22.13.48.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jun 2016 13:48:30 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 11/13] NFS: Remove racy size manipulations in O_DIRECT Date: Wed, 22 Jun 2016 16:47:46 -0400 Message-Id: <1466628468-3958-11-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466628468-3958-10-git-send-email-trond.myklebust@primarydata.com> References: <1466628468-3958-1-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-2-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-3-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-4-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-5-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-6-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-7-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-8-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-9-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-10-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On success, the RPC callbacks will ensure that we make the appropriate calls to nfs_writeback_update_inode() Signed-off-by: Trond Myklebust --- fs/nfs/direct.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 2333e9973802..d96a4b7aa5c0 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -376,15 +376,6 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq, bool write) { struct inode *inode = dreq->inode; - if (dreq->iocb && write) { - loff_t pos = dreq->iocb->ki_pos + dreq->count; - - spin_lock(&inode->i_lock); - if (i_size_read(inode) < pos) - i_size_write(inode, pos); - spin_unlock(&inode->i_lock); - } - if (write) nfs_zap_mapping(inode, inode->i_mapping); @@ -1058,14 +1049,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter) if (!result) { result = nfs_direct_wait(dreq); if (result > 0) { - struct inode *inode = mapping->host; - iocb->ki_pos = pos + result; - spin_lock(&inode->i_lock); - if (i_size_read(inode) < iocb->ki_pos) - i_size_write(inode, iocb->ki_pos); - spin_unlock(&inode->i_lock); - /* XXX: should check the generic_write_sync retval */ generic_write_sync(iocb, result); }