summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-01-22 04:58:58 +0100
committerMike Marshall <hubcap@omnibond.com>2016-01-23 18:42:43 +0100
commitb7ae37b09e069a5d8d604caabd6675456a0d89fc (patch)
tree46b04a5a7fde8a7834513295b70a7c555d37712c
parentmake orangefs_clean_up_interrupted_operation() static (diff)
downloadlinux-b7ae37b09e069a5d8d604caabd6675456a0d89fc.tar.xz
linux-b7ae37b09e069a5d8d604caabd6675456a0d89fc.zip
orangefs: make wait_for_...downcall() static
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to '')
-rw-r--r--fs/orangefs/orangefs-kernel.h2
-rw-r--r--fs/orangefs/waitqueue.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index d78f3852bc4d..825545a7d167 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -474,8 +474,6 @@ void purge_inprogress_ops(void);
/*
* defined in waitqueue.c
*/
-int wait_for_matching_downcall(struct orangefs_kernel_op_s *op);
-int wait_for_cancellation_downcall(struct orangefs_kernel_op_s *op);
void purge_waiting_ops(void);
/*
diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c
index bc86f16c2037..0b04f4197526 100644
--- a/fs/orangefs/waitqueue.c
+++ b/fs/orangefs/waitqueue.c
@@ -382,7 +382,7 @@ static void orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s
* operation since client-core seems to be exiting too often
* or if we were interrupted.
*/
-int wait_for_matching_downcall(struct orangefs_kernel_op_s *op)
+static int wait_for_matching_downcall(struct orangefs_kernel_op_s *op)
{
int ret = -EINVAL;
DEFINE_WAIT(wait_entry);
@@ -488,7 +488,7 @@ int wait_for_matching_downcall(struct orangefs_kernel_op_s *op)
* cancellation upcall anyway. the only way to exit this is to either
* timeout or have the cancellation be serviced properly.
*/
-int wait_for_cancellation_downcall(struct orangefs_kernel_op_s *op)
+static int wait_for_cancellation_downcall(struct orangefs_kernel_op_s *op)
{
int ret = -EINVAL;
DEFINE_WAIT(wait_entry);