orangefs: delay freeing slot until cancel completes

[deliverable/linux.git] / fs / orangefs / devorangefs-req.c

diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index 37278f5878b3b71142fccf439161aba846808a99..6a7df1204bfc9b2df33673de961a0002ea13ccee 100644 (file)
--- 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 */