Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15191cac authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0918cf03

drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h

+0 −6
Original line number Diff line number Diff line
@@ -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)

drivers/staging/lustre/lustre/ptlrpc/events.c

+1 −1
Original line number Diff line number Diff line
@@ -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",