NFSv4.1: Fix some issues with pnfs_generic_pg_test
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 10 Jun 2011 17:30:22 +0000 (13:30 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 21 Jun 2011 15:54:05 +0000 (11:54 -0400)
commit8f7d5efbef8718a774ac5e347b4ec069f17fd9b4
treeaa95020eb43fe3cdb45ce96c9ec024b92f5c7621
parent19345cb299e8234006c5125151ab723e851a1d24
NFSv4.1: Fix some issues with pnfs_generic_pg_test

1. If the intention is to coalesce requests 'prev' and 'req' then we
   have to ensure at least that we have a layout starting at
   req_offset(prev).

2. If we're only requesting a minimal layout of length desc->pg_count,
   we need to test the length actually returned by the server before
   we allow the coalescing to occur.

3. We need to deal correctly with (pgio->lseg == NULL)

4. Fixup the test guarding the pnfs_update_layout.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/objlayout/objio_osd.c
fs/nfs/pnfs.c