orangefs: remove cargo-culting spin_lock_irqsave() in service_operation()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>

diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c
index 2e9468f5798106394c36343395e184fa23e23e54..b8a2fcbcce64bca0687d94d79da12830b63355aa 100644 (file)
--- a/fs/orangefs/waitqueue.c
+++ b/fs/orangefs/waitqueue.c
@@ -86,9 +86,6 @@ int service_operation(struct orangefs_kernel_op_s *op,
        sigset_t orig_sigset;
        int ret = 0;
 
-       /* irqflags and wait_entry are only used IF the client-core aborts */
-       unsigned long irqflags;
-
        DEFINE_WAIT(wait_entry);
 
        op->upcall.tgid = current->tgid;
@@ -230,11 +227,9 @@ retry_servicing:
                         * let process sleep for a few seconds so shared
                         * memory system can be initialized.
                         */
-                       spin_lock_irqsave(&op->lock, irqflags);
                        prepare_to_wait(&orangefs_bufmap_init_waitq,
                                        &wait_entry,
                                        TASK_INTERRUPTIBLE);
-                       spin_unlock_irqrestore(&op->lock, irqflags);
 
                        /*
                         * Wait for orangefs_bufmap_initialize() to wake me up
@@ -251,9 +246,7 @@ retry_servicing:
                                     "Is shared memory available? (%d).\n",
                                     orangefs_get_bufmap_init());
 
-                       spin_lock_irqsave(&op->lock, irqflags);
                        finish_wait(&orangefs_bufmap_init_waitq, &wait_entry);
-                       spin_unlock_irqrestore(&op->lock, irqflags);
 
                        if (orangefs_get_bufmap_init() == 0) {
                                gossip_err("%s:The shared memory system has not started in %d seconds after the client core restarted.  Aborting user's request(%s).\n",