c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Linux 3.2 compat: rw_semaphore.wait_lock is raw

Browse Source 
The wait_lock member of the rw_semaphore struct became a raw_spinlock_t
in Linux 3.2 at torvalds/linux@ddb6c9b58a.

Wrap spin_lock_* function calls in a new spl_rwsem_* interface to
ensure type safety if raw_spinlock_t becomes architecture specific,
and to satisfy these compiler warnings:

  warning: passing argument 1 of ‘spinlock_check’
    from incompatible pointer type [enabled by default]
  note: expected ‘struct spinlock_t *’
    but argument is of type ‘struct raw_spinlock_t *’

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes: #76
Closes: zfsonlinux/zfs#463
This commit is contained in:
Darik Horn
2012-01-11 11:44:34 -06:00
committed by Brian Behlendorf
parent 5f6c14b1ed
commit 588d900433
5 changed files with 206 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/rwsem_compat.h
+28 -8
View File
@@ -27,6 +27,26 @@
#include <linux/rwsem.h>
#ifdef RWSEM_SPINLOCK_IS_RAW
#define spl_rwsem_lock_irqsave(lock, flags) \
({ \
raw_spin_lock_irqsave(lock, flags); \
})
#define spl_rwsem_unlock_irqrestore(lock, flags) \
({ \
raw_spin_unlock_irqrestore(lock, flags); \
})
#else
#define spl_rwsem_lock_irqsave(lock, flags) \
({ \
spin_lock_irqsave(lock, flags); \
})
#define spl_rwsem_unlock_irqrestore(lock, flags) \
({ \
spin_unlock_irqrestore(lock, flags); \
})
#endif /* RWSEM_SPINLOCK_IS_RAW */
#ifdef RWSEM_IS_LOCKED_TAKES_WAIT_LOCK
/*
* A race condition in rwsem_is_locked() was fixed in Linux 2.6.33 and the fix
@@ -48,14 +68,14 @@
#else
#define spl_rwsem_is_locked(rwsem) \
({ \
unsigned long _flags_; \
int _rc_; \
spin_lock_irqsave(&rwsem->wait_lock, _flags_); \
_rc_ = rwsem_is_locked(rwsem); \
spin_unlock_irqrestore(&rwsem->wait_lock, _flags_); \
_rc_; \
#define spl_rwsem_is_locked(rwsem) \
({ \
unsigned long _flags_; \
int _rc_; \
spl_rwsem_lock_irqsave(&rwsem->wait_lock, _flags_); \
_rc_ = rwsem_is_locked(rwsem); \
spl_rwsem_unlock_irqrestore(&rwsem->wait_lock, _flags_); \
_rc_; \
})
#endif /* RWSEM_IS_LOCKED_TAKES_WAIT_LOCK */
include/sys/rwlock.h
+8 -8
View File
@@ -52,9 +52,9 @@ spl_rw_set_owner(krwlock_t *rwp)
{
unsigned long flags;
spin_lock_irqsave(&SEM(rwp)->wait_lock, flags);
spl_rwsem_lock_irqsave(&SEM(rwp)->wait_lock, flags);
rwp->rw_owner = current;
spin_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
spl_rwsem_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
}
static inline void
@@ -62,9 +62,9 @@ spl_rw_clear_owner(krwlock_t *rwp)
{
unsigned long flags;
spin_lock_irqsave(&SEM(rwp)->wait_lock, flags);
spl_rwsem_lock_irqsave(&SEM(rwp)->wait_lock, flags);
rwp->rw_owner = NULL;
spin_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
spl_rwsem_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
}
static inline kthread_t *
@@ -73,9 +73,9 @@ rw_owner(krwlock_t *rwp)
unsigned long flags;
kthread_t *owner;
spin_lock_irqsave(&SEM(rwp)->wait_lock, flags);
spl_rwsem_lock_irqsave(&SEM(rwp)->wait_lock, flags);
owner = rwp->rw_owner;
spin_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
spl_rwsem_unlock_irqrestore(&SEM(rwp)->wait_lock, flags);
return owner;
}
@@ -187,14 +187,14 @@ extern int __down_write_trylock_locked(struct rw_semaphore *);
unsigned long _flags_; \
int _rc_ = 0; \
\
spin_lock_irqsave(&SEM(rwp)->wait_lock, _flags_); \
spl_rwsem_lock_irqsave(&SEM(rwp)->wait_lock, _flags_); \
if ((list_empty(&SEM(rwp)->wait_list)) && \
(SEM(rwp)->activity == 1)) { \
__up_read_locked(SEM(rwp)); \
VERIFY(_rc_ = __down_write_trylock_locked(SEM(rwp))); \
(rwp)->rw_owner = current; \
} \
spin_unlock_irqrestore(&SEM(rwp)->wait_lock, _flags_); \
spl_rwsem_unlock_irqrestore(&SEM(rwp)->wait_lock, _flags_); \
_rc_; \
})
#else