LU-13783 libcfs: use lsmcontext in security_release_secctx

[fs/lustre-release.git] / lustre / obdclass / upcall_cache.c

diff --git a/lustre/obdclass/upcall_cache.c b/lustre/obdclass/upcall_cache.c
index 6023346..76f13e7 100644 (file)
--- a/lustre/obdclass/upcall_cache.c
+++ b/lustre/obdclass/upcall_cache.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/obdclass/upcall_cache.c
  *
@@ -35,7 +34,6 @@
  */
 #define DEBUG_SUBSYSTEM S_SEC
 
-#include <libcfs/linux/linux-misc.h>
 #include <libcfs/libcfs.h>
 #include <uapi/linux/lnet/lnet-types.h>
 #include <upcall_cache.h>
@@ -126,7 +124,7 @@ static int check_unlink_entry(struct upcall_cache *cache,
                        return 0;
 
                UC_CACHE_SET_EXPIRED(entry);
-               wake_up_all(&entry->ue_waitq);
+               wake_up(&entry->ue_waitq);
        } else if (!UC_CACHE_IS_INVALID(entry)) {
                UC_CACHE_SET_EXPIRED(entry);
        }
@@ -203,7 +201,7 @@ find_again:
                if (rc < 0) {
                        UC_CACHE_CLEAR_ACQUIRING(entry);
                        UC_CACHE_SET_INVALID(entry);
-                       wake_up_all(&entry->ue_waitq);
+                       wake_up(&entry->ue_waitq);
                        if (unlikely(rc == -EREMCHG)) {
                                put_entry(cache, entry);
                                GOTO(out, entry = ERR_PTR(rc));
@@ -218,7 +216,7 @@ find_again:
                              MAX_SCHEDULE_TIMEOUT;
                long left;
 
-               init_waitqueue_entry(&wait, current);
+               init_wait(&wait);
                add_wait_queue(&entry->ue_waitq, &wait);
                set_current_state(TASK_INTERRUPTIBLE);
                spin_unlock(&cache->uc_lock);
@@ -351,7 +349,7 @@ out:
        }
        UC_CACHE_CLEAR_ACQUIRING(entry);
        spin_unlock(&cache->uc_lock);
-       wake_up_all(&entry->ue_waitq);
+       wake_up(&entry->ue_waitq);
        put_entry(cache, entry);
 
        RETURN(rc);