3 files changed, 20 insertions, 32 deletions

diff --git a/fs/dquot.c b/fs/dquot.c
index a561fb29e203..5bdc4b2a872a 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -79,6 +79,7 @@
 #include <linux/buffer_head.h>
 #include <linux/capability.h>
 #include <linux/quotaops.h>
+#include <linux/writeback.h> /* for inode_lock, oddly enough.. */
 
 #include <asm/uaccess.h>
 
@@ -755,15 +756,30 @@ static void put_dquot_list(struct list_head *tofree_head)
         }
 }
 
+static void remove_dquot_ref(struct super_block *sb, int type,
+                struct list_head *tofree_head)
+{
+        struct inode *inode;
+
+        spin_lock(&inode_lock);
+        list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {
+                if (!IS_NOQUOTA(inode))
+                        remove_inode_dquot_ref(inode, type, tofree_head);
+        }
+        spin_unlock(&inode_lock);
+}
+
 /* Gather all references from inodes and drop them */
 static void drop_dquot_ref(struct super_block *sb, int type)
 {
         LIST_HEAD(tofree_head);
 
-        down_write(&sb_dqopt(sb)->dqptr_sem);
-        remove_dquot_ref(sb, type, &tofree_head);
-        up_write(&sb_dqopt(sb)->dqptr_sem);
-        put_dquot_list(&tofree_head);
+        if (sb->dq_op) {
+                down_write(&sb_dqopt(sb)->dqptr_sem);
+                remove_dquot_ref(sb, type, &tofree_head);
+                up_write(&sb_dqopt(sb)->dqptr_sem);
+                put_dquot_list(&tofree_head);
+        }
 }
 
 static inline void dquot_incr_inodes(struct dquot *dquot, unsigned long number)
diff --git a/fs/inode.c b/fs/inode.c
index e6d93070f140..5e32432a7608 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1251,33 +1251,6 @@ int inode_needs_sync(struct inode *inode)
 
 EXPORT_SYMBOL(inode_needs_sync);
 
-/*
- *      Quota functions that want to walk the inode lists..
- */
-#ifdef CONFIG_QUOTA
-
-void remove_dquot_ref(struct super_block *sb, int type,
-                        struct list_head *tofree_head)
-{
-        struct inode *inode;
-
-        if (!sb->dq_op)
-                return; /* nothing to do */
-        spin_lock(&inode_lock); /* This lock is for inodes code */
-
-        /*
-         * We don't have to lock against quota code - test IS_QUOTAINIT is
-         * just for speedup...
-         */
-        list_for_each_entry(inode, &sb->s_inodes, i_sb_list)
-                if (!IS_NOQUOTA(inode))
-                        remove_inode_dquot_ref(inode, type, tofree_head);
-
-        spin_unlock(&inode_lock);
-}
-
-#endif
-
 int inode_wait(void *word)
 {
         schedule();
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 20fd1619ccfb..990adcbc0df2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1688,7 +1688,6 @@ extern struct inode *new_inode(struct super_block *);
 extern int __remove_suid(struct dentry *, int);
 extern int should_remove_suid(struct dentry *);
 extern int remove_suid(struct dentry *);
-extern void remove_dquot_ref(struct super_block *, int, struct list_head *);
 
 extern void __insert_inode_hash(struct inode *, unsigned long hashval);
 extern void remove_inode_hash(struct inode *);