staging: lustre: remove ALLOC_ATOMIC_TRY

Come on, is it so hard to type "GFP_ATOMIC"?  Look, it's less
characters!!!

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
index 526c77c..0f2fd79 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
@@ -72,12 +72,6 @@
 #define NUM_CACHEPAGES totalram_pages
 #endif
 
-/*
- * In Linux there is no way to determine whether current execution context is
- * blockable.
- */
-#define ALLOC_ATOMIC_TRY   GFP_ATOMIC
-
 #define DECL_MMSPACE           mm_segment_t __oldfs
 #define MMSPACE_OPEN \
        do { __oldfs = get_fs(); set_fs(get_ds()); } while (0)

diff --git a/drivers/staging/lustre/lustre/ptlrpc/events.c b/drivers/staging/lustre/lustre/ptlrpc/events.c
index f1a5693..c3ec21d 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/events.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/events.c
@@ -310,7 +310,7 @@ void request_in_callback(lnet_event_t *ev)
                        /* We moaned above already... */
                        return;
                }
-               req = ptlrpc_request_cache_alloc(ALLOC_ATOMIC_TRY);
+               req = ptlrpc_request_cache_alloc(GFP_ATOMIC);
                if (req == NULL) {
                        CERROR("Can't allocate incoming request descriptor: "
                               "Dropping %s RPC from %s\n",