Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb58b731 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] move remove_dquot_ref to dqout.c 



Remove_dquot_ref can move to dqout.c instead of beeing in inode.c under
#ifdef CONFIG_QUOTA.  Also clean the resulting code up a tiny little bit by
testing sb->dq_op earlier - it's constant over a filesystems lifetime.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ea6f3281

fs/dquot.c

+20 −4
Original line number Diff line number Diff line
@@ -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,16 +756,31 @@ 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);



	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)

{

fs/inode.c

+0 −27
Original line number Diff line number Diff line
@@ -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();

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -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 *);