NFSD: Fix bad update of layout in nfsd4_return_file_layout
authorKinglong Mee <kinglongmee@gmail.com>
Sun, 22 Mar 2015 14:17:20 +0000 (22:17 +0800)
committerJ. Bruce Fields <bfields@redhat.com>
Thu, 26 Mar 2015 01:13:03 +0000 (21:13 -0400)
With return layout as, (seg is return layout, lo is record layout)
seg->offset <= lo->offset and layout_end(seg) < layout_end(lo),
nfsd should update lo's offset to seg's end,
and,
seg->offset > lo->offset and layout_end(seg) >= layout_end(lo),
nfsd should update lo's end to seg's offset.

Fixes: 9cf514ccfa ("nfsd: implement pNFS operations")
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4layouts.c

Simple merge