diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-18 23:23:21 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-18 23:23:21 -0500 |
commit | 4ff376feaf57af94e08c8df769e7c48b805ac897 (patch) | |
tree | 00c24b5f282e6658fb0639f3b3069991ccd99013 /ipc/sem.c | |
parent | 7e94d6c4ab69562423fdc18801050a84462c2787 (diff) | |
download | talos-obmc-linux-4ff376feaf57af94e08c8df769e7c48b805ac897.tar.gz talos-obmc-linux-4ff376feaf57af94e08c8df769e7c48b805ac897.zip |
NFSv4.1/pnfs: Fix a close/delegreturn hang when return-on-close is set
The helper pnfs_roc() has already verified that we have no delegations,
and no further open files, hence no outstanding I/O and it has marked
all the return-on-close lsegs as being invalid.
Furthermore, it sets the NFS_LAYOUT_RETURN bit, thus serialising the
close/delegreturn with all future layoutget calls on this inode.
The checks in pnfs_roc_drain() for valid layout segments are therefore
redundant: those cannot exist until another layoutget completes.
The other check for whether or not NFS_LAYOUT_RETURN is set, actually
causes a hang, since we already know that we hold that flag.
To fix, we therefore strip out all the functionality in pnfs_roc_drain()
except the retrieval of the barrier state, and then rename the function
accordingly.
Reported-by: Christoph Hellwig <hch@infradead.org>
Fixes: 5c4a79fb2b1c ("Don't prevent layoutgets when doing return-on-close")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'ipc/sem.c')
0 files changed, 0 insertions, 0 deletions