diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-02-11 23:07:19 -0500 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-02-19 13:45:53 -0500 |
| commit | 78699e29fd784a4613d254a22627f336c55c4a76 (patch) | |
| tree | c3a8d93a89dd7abed775cdd27a9349cbbd0e539c /fs/orangefs/devorangefs-req.c | |
| parent | 1357d06d49d1f87af48ab768d34af55bff18b0c3 (diff) | |
| download | op-kernel-dev-78699e29fd784a4613d254a22627f336c55c4a76.zip op-kernel-dev-78699e29fd784a4613d254a22627f336c55c4a76.tar.gz | |
orangefs: delay freeing slot until cancel completes
Make cancels reuse the aborted read/write op, to make sure they do not
fail on lack of memory.
Don't issue a cancel unless the daemon has seen our read/write, has not
replied and isn't being shut down.
If cancel *is* issued, don't wait for it to complete; stash the slot
in there and just have it freed when cancel is finally replied to or
purged (and delay dropping the reference until then, obviously).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs/devorangefs-req.c')
| -rw-r--r-- | fs/orangefs/devorangefs-req.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c index 37278f5..6a7df12 100644 --- a/fs/orangefs/devorangefs-req.c +++ b/fs/orangefs/devorangefs-req.c @@ -438,6 +438,8 @@ wakeup: } } out: + if (unlikely(op_is_cancel(op))) + put_cancel(op); op_release(op); return ret; @@ -546,6 +548,11 @@ int is_daemon_in_service(void) return in_service; } +bool __is_daemon_in_service(void) +{ + return open_access_count == 1; +} + static inline long check_ioctl_command(unsigned int command) { /* Check for valid ioctl codes */ |
