git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Unwrap XFS_SB_LOCK.
[pandora-kernel.git]
/
fs
/
xfs
/
quota
/
xfs_qm_syscalls.c
diff --git
a/fs/xfs/quota/xfs_qm_syscalls.c
b/fs/xfs/quota/xfs_qm_syscalls.c
index
ad5579d
..
2cc5886
100644
(file)
--- a/
fs/xfs/quota/xfs_qm_syscalls.c
+++ b/
fs/xfs/quota/xfs_qm_syscalls.c
@@
-200,7
+200,6
@@
xfs_qm_scall_quotaoff(
boolean_t force)
{
uint dqtype;
boolean_t force)
{
uint dqtype;
- unsigned long s;
int error;
uint inactivate_flags;
xfs_qoff_logitem_t *qoffstart;
int error;
uint inactivate_flags;
xfs_qoff_logitem_t *qoffstart;
@@
-237,9
+236,9
@@
xfs_qm_scall_quotaoff(
if ((flags & XFS_ALL_QUOTA_ACCT) == 0) {
mp->m_qflags &= ~(flags);
if ((flags & XFS_ALL_QUOTA_ACCT) == 0) {
mp->m_qflags &= ~(flags);
- s
= XFS_SB_LOCK(mp
);
+ s
pin_lock(&mp->m_sb_lock
);
mp->m_sb.sb_qflags = mp->m_qflags;
mp->m_sb.sb_qflags = mp->m_qflags;
-
XFS_SB_UNLOCK(mp, s
);
+
spin_unlock(&mp->m_sb_lock
);
mutex_unlock(&(XFS_QI_QOFFLOCK(mp)));
/* XXX what to do if error ? Revert back to old vals incore ? */
mutex_unlock(&(XFS_QI_QOFFLOCK(mp)));
/* XXX what to do if error ? Revert back to old vals incore ? */
@@
-415,7
+414,6
@@
xfs_qm_scall_quotaon(
uint flags)
{
int error;
uint flags)
{
int error;
- unsigned long s;
uint qf;
uint accflags;
__int64_t sbflags;
uint qf;
uint accflags;
__int64_t sbflags;
@@
-468,10
+466,10
@@
xfs_qm_scall_quotaon(
* Change sb_qflags on disk but not incore mp->qflags
* if this is the root filesystem.
*/
* Change sb_qflags on disk but not incore mp->qflags
* if this is the root filesystem.
*/
- s
= XFS_SB_LOCK(mp
);
+ s
pin_lock(&mp->m_sb_lock
);
qf = mp->m_sb.sb_qflags;
mp->m_sb.sb_qflags = qf | flags;
qf = mp->m_sb.sb_qflags;
mp->m_sb.sb_qflags = qf | flags;
-
XFS_SB_UNLOCK(mp, s
);
+
spin_unlock(&mp->m_sb_lock
);
/*
* There's nothing to change if it's the same.
/*
* There's nothing to change if it's the same.
@@
-815,7
+813,6
@@
xfs_qm_log_quotaoff(
{
xfs_trans_t *tp;
int error;
{
xfs_trans_t *tp;
int error;
- unsigned long s;
xfs_qoff_logitem_t *qoffi=NULL;
uint oldsbqflag=0;
xfs_qoff_logitem_t *qoffi=NULL;
uint oldsbqflag=0;
@@
-832,10
+829,10
@@
xfs_qm_log_quotaoff(
qoffi = xfs_trans_get_qoff_item(tp, NULL, flags & XFS_ALL_QUOTA_ACCT);
xfs_trans_log_quotaoff_item(tp, qoffi);
qoffi = xfs_trans_get_qoff_item(tp, NULL, flags & XFS_ALL_QUOTA_ACCT);
xfs_trans_log_quotaoff_item(tp, qoffi);
- s
= XFS_SB_LOCK(mp
);
+ s
pin_lock(&mp->m_sb_lock
);
oldsbqflag = mp->m_sb.sb_qflags;
mp->m_sb.sb_qflags = (mp->m_qflags & ~(flags)) & XFS_MOUNT_QUOTA_ALL;
oldsbqflag = mp->m_sb.sb_qflags;
mp->m_sb.sb_qflags = (mp->m_qflags & ~(flags)) & XFS_MOUNT_QUOTA_ALL;
-
XFS_SB_UNLOCK(mp, s
);
+
spin_unlock(&mp->m_sb_lock
);
xfs_mod_sb(tp, XFS_SB_QFLAGS);
xfs_mod_sb(tp, XFS_SB_QFLAGS);
@@
-854,9
+851,9
@@
error0:
* No one else is modifying sb_qflags, so this is OK.
* We still hold the quotaofflock.
*/
* No one else is modifying sb_qflags, so this is OK.
* We still hold the quotaofflock.
*/
- s
= XFS_SB_LOCK(mp
);
+ s
pin_lock(&mp->m_sb_lock
);
mp->m_sb.sb_qflags = oldsbqflag;
mp->m_sb.sb_qflags = oldsbqflag;
-
XFS_SB_UNLOCK(mp, s
);
+
spin_unlock(&mp->m_sb_lock
);
}
*qoffstartp = qoffi;
return (error);
}
*qoffstartp = qoffi;
return (error);