- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.

[linux-flexiantxendom0-3.2.10.git] / fs / quota.c

diff --git a/fs/quota.c b/fs/quota.c
index b9dae76..9f237d6 100644 (file)
--- a/fs/quota.c
+++ b/fs/quota.c
@@ -11,7 +11,6 @@
 #include <asm/current.h>
 #include <asm/uaccess.h>
 #include <linux/kernel.h>
-#include <linux/smp_lock.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/buffer_head.h>
@@ -158,7 +157,6 @@ static int check_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t
 static void quota_sync_sb(struct super_block *sb, int type)
 {
        int cnt;
-       struct inode *discard[MAXQUOTAS];
 
        sb->s_qcop->quota_sync(sb, type);
        /* This is not very clever (and fast) but currently I don't know about
@@ -168,29 +166,21 @@ static void quota_sync_sb(struct super_block *sb, int type)
                sb->s_op->sync_fs(sb, 1);
        sync_blockdev(sb->s_bdev);
 
-       /* Now when everything is written we can discard the pagecache so
-        * that userspace sees the changes. We need i_mutex and so we could
-        * not do it inside dqonoff_mutex. Moreover we need to be carefull
-        * about races with quotaoff() (that is the reason why we have own
-        * reference to inode). */
+       /*
+        * Now when everything is written we can discard the pagecache so
+        * that userspace sees the changes.
+        */
        mutex_lock(&sb_dqopt(sb)->dqonoff_mutex);
        for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-               discard[cnt] = NULL;
                if (type != -1 && cnt != type)
                        continue;
                if (!sb_has_quota_enabled(sb, cnt))
                        continue;
-               discard[cnt] = igrab(sb_dqopt(sb)->files[cnt]);
+               mutex_lock_nested(&sb_dqopt(sb)->files[cnt]->i_mutex, I_MUTEX_QUOTA);
+               truncate_inode_pages(&sb_dqopt(sb)->files[cnt]->i_data, 0);
+               mutex_unlock(&sb_dqopt(sb)->files[cnt]->i_mutex);
        }
        mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
-       for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
-               if (discard[cnt]) {
-                       mutex_lock(&discard[cnt]->i_mutex);
-                       truncate_inode_pages(&discard[cnt]->i_data, 0);
-                       mutex_unlock(&discard[cnt]->i_mutex);
-                       iput(discard[cnt]);
-               }
-       }
 }
 
 void sync_dquots(struct super_block *sb, int type)