diff options
| author | Niv Sardi <xaiki@debian.org> | 2008-11-07 15:07:12 +1100 |
|---|---|---|
| committer | Niv Sardi <xaiki@debian.org> | 2008-11-07 15:07:12 +1100 |
| commit | dcd7b4e5c0649b1d2219399529b20de1df517e55 (patch) | |
| tree | ef00739e48ddda0a30061d62a7348ed4b0c9aeeb /fs/xfs/quota/xfs_qm.c | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
| parent | 91b777125175077fb74025608dba87f100586c62 (diff) | |
| download | op-kernel-dev-dcd7b4e5c0649b1d2219399529b20de1df517e55.zip op-kernel-dev-dcd7b4e5c0649b1d2219399529b20de1df517e55.tar.gz | |
Merge branch 'master' of git://oss.sgi.com:8090/xfs/linux-2.6
Diffstat (limited to 'fs/xfs/quota/xfs_qm.c')
| -rw-r--r-- | fs/xfs/quota/xfs_qm.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index df0ffef..5b198d1 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c @@ -20,7 +20,6 @@ #include "xfs_bit.h" #include "xfs_log.h" #include "xfs_inum.h" -#include "xfs_clnt.h" #include "xfs_trans.h" #include "xfs_sb.h" #include "xfs_ag.h" @@ -987,14 +986,10 @@ xfs_qm_dqdetach( } /* - * This is called by VFS_SYNC and flags arg determines the caller, - * and its motives, as done in xfs_sync. - * - * vfs_sync: SYNC_FSDATA|SYNC_ATTR|SYNC_BDFLUSH 0x31 - * syscall sync: SYNC_FSDATA|SYNC_ATTR|SYNC_DELWRI 0x25 - * umountroot : SYNC_WAIT | SYNC_CLOSE | SYNC_ATTR | SYNC_FSDATA + * This is called to sync quotas. We can be told to use non-blocking + * semantics by either the SYNC_BDFLUSH flag or the absence of the + * SYNC_WAIT flag. */ - int xfs_qm_sync( xfs_mount_t *mp, @@ -1137,7 +1132,6 @@ xfs_qm_init_quotainfo( return error; } - spin_lock_init(&qinf->qi_pinlock); xfs_qm_list_init(&qinf->qi_dqlist, "mpdqlist", 0); qinf->qi_dqreclaims = 0; @@ -1234,7 +1228,6 @@ xfs_qm_destroy_quotainfo( */ xfs_qm_rele_quotafs_ref(mp); - spinlock_destroy(&qi->qi_pinlock); xfs_qm_list_destroy(&qi->qi_dqlist); if (qi->qi_uquotaip) { |
