projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm: Mark set/drop master ioctl as unlocked.
[cascardo/linux.git]
/
fs
/
xfs
/
mrlock.h
diff --git
a/fs/xfs/mrlock.h
b/fs/xfs/mrlock.h
index
ff6a198
..
e3c92d1
100644
(file)
--- a/
fs/xfs/mrlock.h
+++ b/
fs/xfs/mrlock.h
@@
-22,12
+22,12
@@
typedef struct {
struct rw_semaphore mr_lock;
typedef struct {
struct rw_semaphore mr_lock;
-#if
def DEBUG
+#if
defined(DEBUG) || defined(XFS_WARN)
int mr_writer;
#endif
} mrlock_t;
int mr_writer;
#endif
} mrlock_t;
-#if
def DEBUG
+#if
defined(DEBUG) || defined(XFS_WARN)
#define mrinit(mrp, name) \
do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0)
#else
#define mrinit(mrp, name) \
do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0)
#else
@@
-46,7
+46,7
@@
static inline void mraccess_nested(mrlock_t *mrp, int subclass)
static inline void mrupdate_nested(mrlock_t *mrp, int subclass)
{
down_write_nested(&mrp->mr_lock, subclass);
static inline void mrupdate_nested(mrlock_t *mrp, int subclass)
{
down_write_nested(&mrp->mr_lock, subclass);
-#if
def DEBUG
+#if
defined(DEBUG) || defined(XFS_WARN)
mrp->mr_writer = 1;
#endif
}
mrp->mr_writer = 1;
#endif
}
@@
-60,7
+60,7
@@
static inline int mrtryupdate(mrlock_t *mrp)
{
if (!down_write_trylock(&mrp->mr_lock))
return 0;
{
if (!down_write_trylock(&mrp->mr_lock))
return 0;
-#if
def DEBUG
+#if
defined(DEBUG) || defined(XFS_WARN)
mrp->mr_writer = 1;
#endif
return 1;
mrp->mr_writer = 1;
#endif
return 1;
@@
-68,7
+68,7
@@
static inline int mrtryupdate(mrlock_t *mrp)
static inline void mrunlock_excl(mrlock_t *mrp)
{
static inline void mrunlock_excl(mrlock_t *mrp)
{
-#if
def DEBUG
+#if
defined(DEBUG) || defined(XFS_WARN)
mrp->mr_writer = 0;
#endif
up_write(&mrp->mr_lock);
mrp->mr_writer = 0;
#endif
up_write(&mrp->mr_lock);
@@
-81,7
+81,7
@@
static inline void mrunlock_shared(mrlock_t *mrp)
static inline void mrdemote(mrlock_t *mrp)
{
static inline void mrdemote(mrlock_t *mrp)
{
-#if
def DEBUG
+#if
defined(DEBUG) || defined(XFS_WARN)
mrp->mr_writer = 0;
#endif
downgrade_write(&mrp->mr_lock);
mrp->mr_writer = 0;
#endif
downgrade_write(&mrp->mr_lock);