mr*() functions need to take struct rw_semaphore as parameter.
Signed-off-by: Pavel Reichl <preichl@xxxxxxxxxx>
---
fs/xfs/mrlock.h | 38 ++++++++++++++++++--------------------
fs/xfs/xfs_inode.c | 8 ++++----
fs/xfs/xfs_inode.h | 6 ++++--
fs/xfs/xfs_iops.c | 4 ++--
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/fs/xfs/mrlock.h b/fs/xfs/mrlock.h
index 1923be92a832..245f417a7ffe 100644
--- a/fs/xfs/mrlock.h
+++ b/fs/xfs/mrlock.h
@@ -13,51 +13,49 @@ typedef struct {
} mrlock_t;
#if defined(DEBUG) || defined(XFS_WARN)
-#define mrinit(mrp, name) \
- do { init_rwsem(&(mrp)->mr_lock); } while (0)
+#define mrinit(smp, name) init_rwsem(smp)
#else
-#define mrinit(mrp, name) \
- do { init_rwsem(&(mrp)->mr_lock); } while (0)
+#define mrinit(smp, name) init_rwsem(smp)
#endif
-#define mrlock_init(mrp, t,n,s) mrinit(mrp, n)
-#define mrfree(mrp) do { } while (0)
+#define mrlock_init(smp, t, n, s) mrinit(smp, n)
+#define mrfree(smp) do { } while (0)
-static inline void mraccess_nested(mrlock_t *mrp, int subclass)
+static inline void mraccess_nested(struct rw_semaphore *s, int subclass)
{
- down_read_nested(&mrp->mr_lock, subclass);
+ down_read_nested(s, subclass);
}
-static inline void mrupdate_nested(mrlock_t *mrp, int subclass)
+static inline void mrupdate_nested(struct rw_semaphore *s, int subclass)
{
- down_write_nested(&mrp->mr_lock, subclass);
+ down_write_nested(s, subclass);
}
-static inline int mrtryaccess(mrlock_t *mrp)
+static inline int mrtryaccess(struct rw_semaphore *s)
{
- return down_read_trylock(&mrp->mr_lock);
+ return down_read_trylock(s);
}
-static inline int mrtryupdate(mrlock_t *mrp)
+static inline int mrtryupdate(struct rw_semaphore *s)
{
- if (!down_write_trylock(&mrp->mr_lock))
+ if (!down_write_trylock(s))
return 0;
return 1;
}
-static inline void mrunlock_excl(mrlock_t *mrp)
+static inline void mrunlock_excl(struct rw_semaphore *s)
{
- up_write(&mrp->mr_lock);
+ up_write(s);
}
-static inline void mrunlock_shared(mrlock_t *mrp)
+static inline void mrunlock_shared(struct rw_semaphore *s)
{
- up_read(&mrp->mr_lock);
+ up_read(s);
}
-static inline void mrdemote(mrlock_t *mrp)
+static inline void mrdemote(struct rw_semaphore *s)
{
- downgrade_write(&mrp->mr_lock);
+ downgrade_write(s);
}
#endif /* __XFS_SUPPORT_MRLOCK_H__ */
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 32fac6152dc3..567dae69cfac 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -353,17 +353,17 @@ xfs_isilocked(
if (lock_flags & (XFS_ILOCK_EXCL|XFS_ILOCK_SHARED)) {
if (!(lock_flags & XFS_ILOCK_SHARED))
return !debug_locks ||
- lockdep_is_held_type(&ip->i_lock.mr_lock, 0);
- return rwsem_is_locked(&ip->i_lock.mr_lock);
+ lockdep_is_held_type(&ip->i_lock, 0);
+ return rwsem_is_locked(&ip->i_lock);
}
if (lock_flags & (XFS_MMAPLOCK_EXCL|XFS_MMAPLOCK_SHARED)) {
if (!(lock_flags & XFS_MMAPLOCK_SHARED))
return !debug_locks ||
lockdep_is_held_type(
- &ip->i_mmaplock.mr_lock,
+ &ip->i_mmaplock,
0);
- return rwsem_is_locked(&ip->i_mmaplock.mr_lock);
+ return rwsem_is_locked(&ip->i_mmaplock);
}
if (lock_flags & (XFS_IOLOCK_EXCL|XFS_IOLOCK_SHARED)) {
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 492e53992fa9..0ea811587cec 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -9,6 +9,8 @@
#include "xfs_inode_buf.h"
#include "xfs_inode_fork.h"
+#include <linux/rwsem.h>
+
/*
* Kernel only inode definitions
*/
@@ -39,8 +41,8 @@ typedef struct xfs_inode {
/* Transaction and locking information. */
struct xfs_inode_log_item *i_itemp; /* logging information */
- mrlock_t i_lock; /* inode lock */
- mrlock_t i_mmaplock; /* inode mmap IO lock */
+ struct rw_semaphore i_lock; /* inode lock */
+ struct rw_semaphore i_mmaplock; /* inode mmap IO lock */
atomic_t i_pincount; /* inode pin count */
/*
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 81f2f93caec0..7c3df574cf4c 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1319,9 +1319,9 @@ xfs_setup_inode(
*/
lockdep_set_class(&inode->i_rwsem,
&inode->i_sb->s_type->i_mutex_dir_key);
- lockdep_set_class(&ip->i_lock.mr_lock, &xfs_dir_ilock_class);
+ lockdep_set_class(&ip->i_lock, &xfs_dir_ilock_class);
} else {
- lockdep_set_class(&ip->i_lock.mr_lock, &xfs_nondir_ilock_class);
+ lockdep_set_class(&ip->i_lock, &xfs_nondir_ilock_class);
}
/*
--
2.24.1
