]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
NFS: Fix an incorrect type in struct nfs_direct_req
authorTrond Myklebust <trond.myklebust@primarydata.com>
Tue, 6 Mar 2018 17:47:08 +0000 (12:47 -0500)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:33:42 +0000 (21:33 -0400)
[ Upstream commit d9ee65539d3eabd9ade46cca1780e3309ad0f907 ]

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 <trond.myklebust@primarydata.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
fs/nfs/direct.c

index cb050d1e8146d91be5db4fa02b7d317665e9cc7a..10b055105b361b0c03f5fb62c0cc0cdeb17d416a 100644 (file)
@@ -86,9 +86,9 @@ 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 */
                                bytes_left,     /* bytes left to be sent */
-                               io_start,       /* start of IO */
                                error;          /* any reported error */
        struct completion       completion;     /* wait for i/o completion */