diff options
| author | Peng Tao <bergwolf@gmail.com> | 2014-03-05 17:27:20 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-09 07:23:56 +0400 |
| commit | d46a20d2a4ad17be82e3e5d3c3405ffdc5ee687d (patch) | |
| tree | 11a8b866d7f1c3269f2a3a9dd8811c3438905128 /drivers/staging/lustre | |
| parent | 1527469d4ad24f4473ef7267848d2a1721e09be6 (diff) | |
| download | linux-d46a20d2a4ad17be82e3e5d3c3405ffdc5ee687d.tar.xz | |
staging/lustre/libcfs: remove NIDSTR_LOCK/UNLOCK
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/libcfs/nidstrings.c | 7 |
1 files 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; } |