From patchwork Wed Mar 7 20:58:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10265357 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 EBCD160211 for ; Wed, 7 Mar 2018 20:59:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC0C328DAA for ; Wed, 7 Mar 2018 20:59:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0B0129048; Wed, 7 Mar 2018 20:59:05 +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 656C128DAA for ; Wed, 7 Mar 2018 20:59:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754786AbeCGU7D (ORCPT ); Wed, 7 Mar 2018 15:59:03 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:53477 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754578AbeCGU6k (ORCPT ); Wed, 7 Mar 2018 15:58:40 -0500 Received: by mail-it0-f68.google.com with SMTP id w63so4941820ita.3 for ; Wed, 07 Mar 2018 12:58:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Np7qcNu9OmQK+98VUO0ZVrwjNxFJyz4kYcvgL4AEl1s=; b=S2W+L7d3A/y5mLS47vrKb509K4eNq6gi5G1kHDrH3NsEJaGU1dvEbdO9lD/MDESCKS a357WlO8r7zYCgiJWnef+fYuO9renIB0vn8kWRtqx1OpyPj/JbTwo6cBh0wfeqKJR73i RfxZuKO0l4rwC0p3nKCyi2M+8goNDQsJbppdBQAFRn3KMnbFPLWtXa7v3ZnxeFjjRLfi OqhzAruMULOKOyGCVxFiPqrji6DRzVp8MemC7YkpIttL87O0imGCu33BucKWdsaRqbBF WUVTxIl1+lOsHyaWaW3akezCOW8rqG4tp56aqSC/nUm1beIZFmuUrAI5YPFat7/3c8LE uGeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version:content-transfer-encoding; bh=Np7qcNu9OmQK+98VUO0ZVrwjNxFJyz4kYcvgL4AEl1s=; b=Y9uRVXj/xvctGU0uSzaAFTQGMHJpJVfPsGpzUCDJ29E7KpoSSXLWKxtTY5l3pvekp+ GXz+Bi7fQ25WGSPLhHtCn87bh+8ornD9r0W1FCeujtBtjM53RrYpdp3eloa0/13bn2xV qNxT+AzAmS1Aa+IvOxv5Zk2hquvbXnFIYebxmF0ymEOLDhnD9C1YSzHpfw/WHzfIIIZo 5j03NhC137JOy4hCkdgMcrcfpeOLT7GKQJmPWbHIcz9oopA+eRaF/ZIfLhJeOdjXPHMG MMWlKERjbZbpFDhMFvwwkQglerfuhuoE+2kWrX8EtN8qunp8eRG/jdFhbRdMA9JyktEt 2yTA== X-Gm-Message-State: AElRT7GUQnskmTqPVkbvbqciy36B0hOmiKDsGxMe+avrRnKOj6RwI+w/ XqQ+/Hs7MzDk8vO51EcJ2++PI0E= X-Google-Smtp-Source: AG47ELvlojiqIPDcfmrsmCrxm8HMKqSpQYi9TuVauWMK37BbvWS0124ALxNGhdvoEZL3n8qay/KDgw== X-Received: by 10.36.160.137 with SMTP id o131mr25740179ite.18.1520456319584; Wed, 07 Mar 2018 12:58:39 -0800 (PST) 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 j130sm9248090ita.33.2018.03.07.12.58.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Mar 2018 12:58:39 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 1/2] NFS: Fix an incorrect type in struct nfs_direct_req Date: Wed, 7 Mar 2018 15:58:16 -0500 Message-Id: <20180307205817.5913-1-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.14.3 MIME-Version: 1.0 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 The start offset needs to be of type loff_t. Fixed: 5fadeb47dcc5c ("nfs: count DIO good bytes correctly with mirroring") Cc: stable@vger.kernel.org # v4.0+ Signed-off-by: Trond Myklebust --- fs/nfs/direct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 8c10b0562e75..621c517b325c 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -86,10 +86,10 @@ struct nfs_direct_req { struct nfs_direct_mirror mirrors[NFS_PAGEIO_DESCRIPTOR_MIRROR_MAX]; int mirror_count; + loff_t io_start; /* Start offset for I/O */ ssize_t count, /* bytes actually processed */ max_count, /* max expected count */ bytes_left, /* bytes left to be sent */ - io_start, /* start of IO */ error; /* any reported error */ struct completion completion; /* wait for i/o completion */