orangefs: service ops done for writeback are not killable

Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>

diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index a74d9e8c5f9ec137665881e6aadbc3b8659495ce..46b9ad1d2a9b70ee8b8bf3f4d2ef1bc3a7d621b6 100644 (file)
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -442,6 +442,7 @@ extern const struct dentry_operations orangefs_dentry_operations;
 #define ORANGEFS_OP_CANCELLATION  4   /* this is a cancellation */
 #define ORANGEFS_OP_NO_MUTEX      8   /* don't acquire request_mutex */
 #define ORANGEFS_OP_ASYNC         16  /* Queue it, but don't wait */
+#define ORANGEFS_OP_WRITEBACK     32
 
 int service_operation(struct orangefs_kernel_op_s *op,
                      const char *op_name,

diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index a4fac527f85ddd27f34ee507c5ede4e387c4a7eb..9221c4a3398e4a14b524456a2c949394b2dd548d 100644 (file)
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -430,7 +430,7 @@ int orangefs_inode_setattr(struct inode *inode)
        spin_unlock(&inode->i_lock);
 
        ret = service_operation(new_op, __func__,
-           get_interruptible_flag(inode));
+           get_interruptible_flag(inode) | ORANGEFS_OP_WRITEBACK);
        gossip_debug(GOSSIP_UTILS_DEBUG,
            "orangefs_inode_setattr: returning %d\n", ret);
        if (ret)

diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c
index 0729d2645d6af6ffef902546b67257ea8aa2b97d..beafc33d57beab1e6fe3bd8754f7cc25591e80e6 100644 (file)
--- a/fs/orangefs/waitqueue.c
+++ b/fs/orangefs/waitqueue.c
@@ -19,7 +19,7 @@
 
 static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op,
                long timeout,
-               bool interruptible)
+               int flags)
                        __acquires(op->lock);
 static void orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s *op)
        __releases(op->lock);
@@ -143,9 +143,7 @@ retry_servicing:
        if (!(flags & ORANGEFS_OP_NO_MUTEX))
                mutex_unlock(&orangefs_request_mutex);
 
-       ret = wait_for_matching_downcall(op, timeout,
-                                        flags & ORANGEFS_OP_INTERRUPTIBLE);
-
+       ret = wait_for_matching_downcall(op, timeout, flags);
        gossip_debug(GOSSIP_WAIT_DEBUG,
                     "%s: wait_for_matching_downcall returned %d for %p\n",
                     __func__,
@@ -319,10 +317,12 @@ static void
  */
 static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op,
                long timeout,
-               bool interruptible)
+               int flags)
                        __acquires(op->lock)
 {
        long n;
+       int writeback = flags & ORANGEFS_OP_WRITEBACK,
+           interruptible = flags & ORANGEFS_OP_INTERRUPTIBLE;
 
        /*
         * There's a "schedule_timeout" inside of these wait
@@ -330,10 +330,12 @@ static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op,
         * user process that needs something done and is being
         * manipulated by the client-core process.
         */
-       if (interruptible)
+       if (writeback)
+               n = wait_for_completion_io_timeout(&op->waitq, timeout);
+       else if (!writeback && interruptible)
                n = wait_for_completion_interruptible_timeout(&op->waitq,
-                                                             timeout);
-       else
+                                                                     timeout);
+       else /* !writeback && !interruptible but compiler complains */
                n = wait_for_completion_killable_timeout(&op->waitq, timeout);
 
        spin_lock(&op->lock);