kernel.git/fs/nfs/read.c, branch linux-3.17.y

nfs: get rid of duplicate dprintk

2014-06-25T23:01:27Z

This was introduced by a merge error with my recent pgio patchset. Signed-off-by: Weston Andros Adamson Signed-off-by: Trond Myklebust

nfs: merge nfs_pgio_data into _header

2014-06-24T22:47:00Z

struct nfs_pgio_data only exists as a member of nfs_pgio_header, but is passed around everywhere, because there used to be multiple _data structs per _header. Many of these functions then use the _data to find a pointer to the _header. This patch cleans this up by merging the nfs_pgio_data structure into nfs_pgio_header and passing nfs_pgio_header around instead. Reviewed-by: Christoph Hellwig Signed-off-by: Weston Andros Adamson Signed-off-by: Trond Myklebust

nfs: move nfs_pgio_data and remove nfs_rw_header

2014-06-24T22:46:59Z

nfs_rw_header was used to allocate an nfs_pgio_header along with an nfs_pgio_data, because a _header would need at least one _data. Now there is only ever one nfs_pgio_data for each nfs_pgio_header -- move it to nfs_pgio_header and get rid of nfs_rw_header. Reviewed-by: Christoph Hellwig Signed-off-by: Weston Andros Adamson Signed-off-by: Trond Myklebust

nfs: support page groups in nfs_read_completion

2014-05-29T15:11:50Z

nfs_read_completion relied on the fact that there was a 1:1 mapping of page to nfs_request, but this has now changed. Regions not covered by a request have already been zeroed elsewhere. Signed-off-by: Weston Andros Adamson Signed-off-by: Trond Myklebust

nfs: page group syncing in read path

2014-05-29T15:11:45Z

Operations that modify state for a whole page must be syncronized across all requests within a page group. In the read path, this is calling unlock_page and SetPageUptodate. Both of these functions should not be called until all requests in a page group have reached the point where they would call them. This patch should have no effect yet since all page groups currently have one request, but will come into play when pg_test functions are modified to split pages into sub-page regions. Signed-off-by: Weston Andros Adamson Signed-off-by: Trond Myklebust

nfs: add support for multiple nfs reqs per page

2014-05-29T15:11:44Z

Add "page groups" - a circular list of nfs requests (struct nfs_page) that all reference the same page. This gives nfs read and write paths the ability to account for sub-page regions independently. This somewhat follows the design of struct buffer_head's sub-page accounting. Only "head" requests are ever added/removed from the inode list in the buffered write path. "head" and "sub" requests are treated the same through the read path and the rest of the write/commit path. Requests are given an extra reference across the life of the list. Page groups are never rejoined after being split. If the read/write request fails and the client falls back to another path (ie revert to MDS in PNFS case), the already split requests are pushed through the recoalescing code again, which may split them further and then coalesce them into properly sized requests on the wire. Fragmentation shouldn't be a problem with the current design, because we flush all requests in page group when a non-contiguous request is added, so the only time resplitting should occur is on a resend of a read or write. This patch lays the groundwork for sub-page splitting, but does not actually do any splitting. For now all page groups have one request as pg_test functions don't yet split pages. There are several related patches that are needed support multiple requests per page group. Signed-off-by: Weston Andros Adamson Signed-off-by: Trond Myklebust

nfs: remove unused arg from nfs_create_request

2014-05-29T15:11:43Z

@inode is passed but not used. Signed-off-by: Weston Andros Adamson Signed-off-by: Trond Myklebust

NFS: Create a common nfs_pageio_ops struct

2014-05-29T15:11:41Z

At this point the read and write structures look identical, so combine them into something shared by both. Signed-off-by: Anna Schumaker Signed-off-by: Trond Myklebust

NFS: Create a common generic_pg_pgios()

2014-05-29T15:11:41Z

What we have here is two functions that look identical. Let's share some more code! Signed-off-by: Anna Schumaker Signed-off-by: Trond Myklebust

NFS: Create a common multiple_pgios() function

2014-05-29T15:11:40Z

Once again, these two functions look identical in the read and write case. Time to combine them together! Signed-off-by: Anna Schumaker Signed-off-by: Trond Myklebust