| From f20b3284acb500658675610d8030c89c21067fd7 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun, 26 Jul 2009 17:48:08 +0200 |
| Subject: [PATCH] xfs: Convert mr_lock to rw_anon_semaphore |
| |
| commit fa9298a53b64755ca4beb90ade84628af5a5249f in tip. |
| |
| This lock has no struct owner rules and therefore preempt-rt must |
| keep them as real semaphores. Convert them to rw_anon_semaphores and |
| annotate their semantics hereby. |
| |
| [PG: m_pergalock is gone in 34+, just mr_lock remains] |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/xfs/linux-2.6/mrlock.h b/fs/xfs/linux-2.6/mrlock.h |
| index ff6a198..f55cf5b 100644 |
| --- a/fs/xfs/linux-2.6/mrlock.h |
| +++ b/fs/xfs/linux-2.6/mrlock.h |
| @@ -40,12 +40,12 @@ typedef struct { |
| |
| static inline void mraccess_nested(mrlock_t *mrp, int subclass) |
| { |
| - down_read_nested(&mrp->mr_lock, subclass); |
| + anon_down_read_nested(&mrp->mr_lock, subclass); |
| } |
| |
| static inline void mrupdate_nested(mrlock_t *mrp, int subclass) |
| { |
| - down_write_nested(&mrp->mr_lock, subclass); |
| + anon_down_write_nested(&mrp->mr_lock, subclass); |
| #ifdef DEBUG |
| mrp->mr_writer = 1; |
| #endif |
| @@ -53,12 +53,12 @@ static inline void mrupdate_nested(mrlock_t *mrp, int subclass) |
| |
| static inline int mrtryaccess(mrlock_t *mrp) |
| { |
| - return down_read_trylock(&mrp->mr_lock); |
| + return anon_down_read_trylock(&mrp->mr_lock); |
| } |
| |
| static inline int mrtryupdate(mrlock_t *mrp) |
| { |
| - if (!down_write_trylock(&mrp->mr_lock)) |
| + if (!anon_down_write_trylock(&mrp->mr_lock)) |
| return 0; |
| #ifdef DEBUG |
| mrp->mr_writer = 1; |
| @@ -71,12 +71,12 @@ static inline void mrunlock_excl(mrlock_t *mrp) |
| #ifdef DEBUG |
| mrp->mr_writer = 0; |
| #endif |
| - up_write(&mrp->mr_lock); |
| + anon_up_write(&mrp->mr_lock); |
| } |
| |
| static inline void mrunlock_shared(mrlock_t *mrp) |
| { |
| - up_read(&mrp->mr_lock); |
| + anon_up_read(&mrp->mr_lock); |
| } |
| |
| static inline void mrdemote(mrlock_t *mrp) |
| @@ -84,7 +84,7 @@ static inline void mrdemote(mrlock_t *mrp) |
| #ifdef DEBUG |
| mrp->mr_writer = 0; |
| #endif |
| - downgrade_write(&mrp->mr_lock); |
| + anon_downgrade_write(&mrp->mr_lock); |
| } |
| |
| #endif /* __XFS_SUPPORT_MRLOCK_H__ */ |
| -- |
| 1.7.1 |
| |