diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 20:37:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 20:37:56 -0700 |
| commit | 15191cac20909266b4639c61ecf4fe13c49593f3 (patch) | |
| tree | a1d0ad77cd6066ebc669430e359eed031b6734fb /drivers/staging/lustre | |
| parent | 0918cf03c5bff35b57c255c773ae6af33a0bbf1c (diff) | |
| download | blackbird-op-linux-15191cac20909266b4639c61ecf4fe13c49593f3.tar.gz blackbird-op-linux-15191cac20909266b4639c61ecf4fe13c49593f3.zip | |
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>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h | 6 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/ptlrpc/events.c | 2 |
2 files changed, 1 insertions, 7 deletions
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 526c77c4dd84..0f2fd79e5ec8 100644 --- 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 f1a56930c006..c3ec21d5d29f 100644 --- 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", |
