staging: lustre: discard SVC_SIGNAL and related functions

This flag is never set, so remove checks and remove
the flag.

Reviewed-by: James Simmons <[email protected]>
Signed-off-by: NeilBrown <[email protected]>
Reviewed-by: Patrick Farrell <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h
index 3ff5de4770e81ff4c3ff70eac13f16e9f0c3edd7..4c665eca2467e29ee084560d73837fc354dbfad7 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@@ -1260,7 +1260,6 @@ enum {
        SVC_STARTING    = 1 << 2,
        SVC_RUNNING     = 1 << 3,
        SVC_EVENT       = 1 << 4,
-       SVC_SIGNAL      = 1 << 5,
 };
 
 #define PTLRPC_THR_NAME_LEN            32
@@ -1333,11 +1332,6 @@ static inline int thread_is_event(struct ptlrpc_thread *thread)
        return !!(thread->t_flags & SVC_EVENT);
 }
 
-static inline int thread_is_signal(struct ptlrpc_thread *thread)
-{
-       return !!(thread->t_flags & SVC_SIGNAL);
-}
-
 static inline void thread_clear_flags(struct ptlrpc_thread *thread, __u32 flags)
 {
        thread->t_flags &= ~flags;

diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c b/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c
index 8d1e0edfcede3d5bb25524041df32215fd558010..d85c8638c0096f583c2ebee448e56b9022dd146f 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c
@@ -153,7 +153,6 @@ static int sec_gc_main(void *arg)
        while (1) {
                struct ptlrpc_sec *sec;
 
-               thread_clear_flags(thread, SVC_SIGNAL);
                sec_process_ctx_list();
 again:
                /* go through sec list do gc.
@@ -184,8 +183,7 @@ again:
                lwi = LWI_TIMEOUT(msecs_to_jiffies(SEC_GC_INTERVAL * MSEC_PER_SEC),
                                  NULL, NULL);
                l_wait_event(thread->t_ctl_waitq,
-                            thread_is_stopping(thread) ||
-                            thread_is_signal(thread),
+                            thread_is_stopping(thread),
                             &lwi);
 
                if (thread_test_and_clear_flags(thread, SVC_STOPPING))