From 31abc6ad174c240204ce3809151359a321753956 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner 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 Signed-off-by: Paul Gortmaker --- fs/xfs/linux-2.6/mrlock.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fs/xfs/linux-2.6/mrlock.h b/fs/xfs/linux-2.6/mrlock.h index ff6a198..77de2c2 100644 --- a/fs/xfs/linux-2.6/mrlock.h +++ b/fs/xfs/linux-2.6/mrlock.h @@ -21,7 +21,7 @@ #include typedef struct { - struct rw_semaphore mr_lock; + struct rw_anon_semaphore mr_lock; #ifdef DEBUG int mr_writer; #endif @@ -29,10 +29,10 @@ typedef struct { #ifdef DEBUG #define mrinit(mrp, name) \ - do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0) + do { (mrp)->mr_writer = 0; init_anon_rwsem(&(mrp)->mr_lock); } while (0) #else #define mrinit(mrp, name) \ - do { init_rwsem(&(mrp)->mr_lock); } while (0) + do { init_anon_rwsem(&(mrp)->mr_lock); } while (0) #endif #define mrlock_init(mrp, t,n,s) mrinit(mrp, n) @@ -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.4.1