diff options
Diffstat (limited to 'fs/xfs/quota/xfs_qm_syscalls.c')
-rw-r--r-- | fs/xfs/quota/xfs_qm_syscalls.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c index 24690e1af659..676884394aae 100644 --- a/fs/xfs/quota/xfs_qm_syscalls.c +++ b/fs/xfs/quota/xfs_qm_syscalls.c | |||
@@ -15,6 +15,9 @@ | |||
15 | * along with this program; if not, write the Free Software Foundation, | 15 | * along with this program; if not, write the Free Software Foundation, |
16 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 16 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
17 | */ | 17 | */ |
18 | |||
19 | #include <linux/capability.h> | ||
20 | |||
18 | #include "xfs.h" | 21 | #include "xfs.h" |
19 | #include "xfs_fs.h" | 22 | #include "xfs_fs.h" |
20 | #include "xfs_bit.h" | 23 | #include "xfs_bit.h" |
@@ -233,7 +236,7 @@ xfs_qm_scall_quotaoff( | |||
233 | */ | 236 | */ |
234 | ASSERT(mp->m_quotainfo); | 237 | ASSERT(mp->m_quotainfo); |
235 | if (mp->m_quotainfo) | 238 | if (mp->m_quotainfo) |
236 | mutex_lock(&(XFS_QI_QOFFLOCK(mp)), PINOD); | 239 | mutex_lock(&(XFS_QI_QOFFLOCK(mp))); |
237 | 240 | ||
238 | ASSERT(mp->m_quotainfo); | 241 | ASSERT(mp->m_quotainfo); |
239 | 242 | ||
@@ -508,7 +511,7 @@ xfs_qm_scall_quotaon( | |||
508 | /* | 511 | /* |
509 | * Switch on quota enforcement in core. | 512 | * Switch on quota enforcement in core. |
510 | */ | 513 | */ |
511 | mutex_lock(&(XFS_QI_QOFFLOCK(mp)), PINOD); | 514 | mutex_lock(&(XFS_QI_QOFFLOCK(mp))); |
512 | mp->m_qflags |= (flags & XFS_ALL_QUOTA_ENFD); | 515 | mp->m_qflags |= (flags & XFS_ALL_QUOTA_ENFD); |
513 | mutex_unlock(&(XFS_QI_QOFFLOCK(mp))); | 516 | mutex_unlock(&(XFS_QI_QOFFLOCK(mp))); |
514 | 517 | ||
@@ -617,7 +620,7 @@ xfs_qm_scall_setqlim( | |||
617 | * a quotaoff from happening). (XXXThis doesn't currently happen | 620 | * a quotaoff from happening). (XXXThis doesn't currently happen |
618 | * because we take the vfslock before calling xfs_qm_sysent). | 621 | * because we take the vfslock before calling xfs_qm_sysent). |
619 | */ | 622 | */ |
620 | mutex_lock(&(XFS_QI_QOFFLOCK(mp)), PINOD); | 623 | mutex_lock(&(XFS_QI_QOFFLOCK(mp))); |
621 | 624 | ||
622 | /* | 625 | /* |
623 | * Get the dquot (locked), and join it to the transaction. | 626 | * Get the dquot (locked), and join it to the transaction. |
@@ -1426,7 +1429,7 @@ xfs_qm_internalqcheck( | |||
1426 | xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE | XFS_LOG_SYNC); | 1429 | xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE | XFS_LOG_SYNC); |
1427 | XFS_bflush(mp->m_ddev_targp); | 1430 | XFS_bflush(mp->m_ddev_targp); |
1428 | 1431 | ||
1429 | mutex_lock(&qcheck_lock, PINOD); | 1432 | mutex_lock(&qcheck_lock); |
1430 | /* There should be absolutely no quota activity while this | 1433 | /* There should be absolutely no quota activity while this |
1431 | is going on. */ | 1434 | is going on. */ |
1432 | qmtest_udqtab = kmem_zalloc(qmtest_hashmask * | 1435 | qmtest_udqtab = kmem_zalloc(qmtest_hashmask * |