From d46a20d2a4ad17be82e3e5d3c3405ffdc5ee687d Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Wed, 5 Mar 2014 21:27:20 +0800 Subject: [PATCH] staging/lustre/libcfs: remove NIDSTR_LOCK/UNLOCK Cc: Andreas Dilger Cc: Oleg Drokin Signed-off-by: Peng Tao Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/libcfs/nidstrings.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/lustre/lustre/libcfs/nidstrings.c b/drivers/staging/lustre/lustre/libcfs/nidstrings.c index 732ae5540bf4..cfb274fc9cbd 100644 --- a/drivers/staging/lustre/lustre/libcfs/nidstrings.c +++ b/drivers/staging/lustre/lustre/libcfs/nidstrings.c @@ -65,23 +65,20 @@ void libcfs_init_nidstrings(void) spin_lock_init(&libcfs_nidstring_lock); } -# define NIDSTR_LOCK(f) spin_lock_irqsave(&libcfs_nidstring_lock, f) -# define NIDSTR_UNLOCK(f) spin_unlock_irqrestore(&libcfs_nidstring_lock, f) - static char * libcfs_next_nidstring(void) { char *str; unsigned long flags; - NIDSTR_LOCK(flags); + spin_lock_irqsave(&libcfs_nidstring_lock, flags); str = libcfs_nidstrings[libcfs_nidstring_idx++]; if (libcfs_nidstring_idx == sizeof(libcfs_nidstrings)/sizeof(libcfs_nidstrings[0])) libcfs_nidstring_idx = 0; - NIDSTR_UNLOCK(flags); + spin_unlock_irqrestore(&libcfs_nidstring_lock, flags); return str; } -- 2.20.1