nfs41: allow async version layoutreturn
authorPeng Tao <tao.peng@primarydata.com>
Mon, 17 Nov 2014 01:30:40 +0000 (09:30 +0800)
committerTom Haynes <loghyr@primarydata.com>
Tue, 3 Feb 2015 19:06:49 +0000 (11:06 -0800)
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
fs/nfs/nfs4proc.c
fs/nfs/pnfs.c
fs/nfs/pnfs.h

Simple merge
diff --cc fs/nfs/pnfs.c
Simple merge
diff --cc fs/nfs/pnfs.h
Simple merge