|
@@ -17,8 +17,12 @@
|
|
#include "orangefs-kernel.h"
|
|
#include "orangefs-kernel.h"
|
|
#include "orangefs-bufmap.h"
|
|
#include "orangefs-bufmap.h"
|
|
|
|
|
|
-static int wait_for_matching_downcall(struct orangefs_kernel_op_s *, long, bool);
|
|
|
|
-static void orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s *);
|
|
|
|
|
|
+static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op,
|
|
|
|
+ long timeout,
|
|
|
|
+ bool interruptible)
|
|
|
|
+ __acquires(op->lock);
|
|
|
|
+static void orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s *op)
|
|
|
|
+ __releases(op->lock);
|
|
|
|
|
|
/*
|
|
/*
|
|
* What we do in this function is to walk the list of operations that are
|
|
* What we do in this function is to walk the list of operations that are
|
|
@@ -246,6 +250,7 @@ bool orangefs_cancel_op_in_progress(struct orangefs_kernel_op_s *op)
|
|
*/
|
|
*/
|
|
static void
|
|
static void
|
|
orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s *op)
|
|
orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s *op)
|
|
|
|
+ __releases(op->lock)
|
|
{
|
|
{
|
|
/*
|
|
/*
|
|
* handle interrupted cases depending on what state we were in when
|
|
* handle interrupted cases depending on what state we were in when
|
|
@@ -313,8 +318,9 @@ static void
|
|
* Returns with op->lock taken.
|
|
* Returns with op->lock taken.
|
|
*/
|
|
*/
|
|
static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op,
|
|
static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op,
|
|
- long timeout,
|
|
|
|
- bool interruptible)
|
|
|
|
|
|
+ long timeout,
|
|
|
|
+ bool interruptible)
|
|
|
|
+ __acquires(op->lock)
|
|
{
|
|
{
|
|
long n;
|
|
long n;
|
|
|
|
|