diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-08-10 10:42:26 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-08-10 10:42:26 -0400 |
| commit | daf0f0793b401b1cc47f778ce127017752ce4e5b (patch) | |
| tree | f1d988d3ed5b38c83f08471bc3d96024be632f38 | |
| parent | fcfe3d3c4b43359d44562f06f56391929a1dd862 (diff) | |
| download | rt-patches-daf0f0793b401b1cc47f778ce127017752ce4e5b.tar.gz | |
add in missing conversions in xfs patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | xfs-Convert-mr_lock-to-rw_anon_semaphore.patch | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/xfs-Convert-mr_lock-to-rw_anon_semaphore.patch b/xfs-Convert-mr_lock-to-rw_anon_semaphore.patch index 2665225..bff9e23 100644 --- a/xfs-Convert-mr_lock-to-rw_anon_semaphore.patch +++ b/xfs-Convert-mr_lock-to-rw_anon_semaphore.patch @@ -14,13 +14,35 @@ annotate their semantics hereby. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- - fs/xfs/linux-2.6/mrlock.h | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + 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..f55cf5b 100644 +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 <linux/rwsem.h> + + 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) @@ -76,5 +98,5 @@ index ff6a198..f55cf5b 100644 #endif /* __XFS_SUPPORT_MRLOCK_H__ */ -- -1.7.0.4 +1.7.4.1 |