Get rid of the drop dquot operation - it is now always called from
the filesystem and if a filesystem really needs it's own (which none
currently does) it can just call into it's own routine directly.
Rename the now static low-level dquot_drop helper to __dquot_drop
and vfs_dq_drop to dquot_drop to have a consistent namespace.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Index: linux-2.6/fs/ext3/super.c
===================================================================
--- linux-2.6.orig/fs/ext3/super.c 2010-02-20 11:58:09.776023847 +0100
+++ linux-2.6/fs/ext3/super.c 2010-02-20 11:59:10.736253977 +0100
@@ -529,7 +529,7 @@ static void ext3_clear_inode(struct inod
{
struct ext3_block_alloc_info *rsv = EXT3_I(inode)->i_block_alloc_info;
- vfs_dq_drop(inode);
+ dquot_drop(inode);
ext3_discard_reservation(inode);
EXT3_I(inode)->i_block_alloc_info = NULL;
if (unlikely(rsv))
@@ -753,7 +753,6 @@ static ssize_t ext3_quota_write(struct s
static const struct dquot_operations ext3_quota_operations = {
.initialize = dquot_initialize,
- .drop = dquot_drop,
.write_dquot = ext3_write_dquot,
.acquire_dquot = ext3_acquire_dquot,
.release_dquot = ext3_release_dquot,
Index: linux-2.6/fs/ext4/super.c
===================================================================
--- linux-2.6.orig/fs/ext4/super.c 2010-02-20 11:58:09.783026990 +0100
+++ linux-2.6/fs/ext4/super.c 2010-02-20 11:59:10.738253837 +0100
@@ -761,7 +761,7 @@ static void destroy_inodecache(void)
static void ext4_clear_inode(struct inode *inode)
{
- vfs_dq_drop(inode);
+ dquot_drop(inode);
ext4_discard_preallocations(inode);
if (EXT4_JOURNAL(inode))
jbd2_journal_release_jbd_inode(EXT4_SB(inode->i_sb)->s_journal,
@@ -1014,7 +1014,6 @@ static ssize_t ext4_quota_write(struct s
static const struct dquot_operations ext4_quota_operations = {
.initialize = dquot_initialize,
- .drop = dquot_drop,
#ifdef CONFIG_QUOTA
.get_reserved_space = ext4_get_reserved_space,
#endif
Index: linux-2.6/fs/reiserfs/super.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/super.c 2010-02-20 11:58:09.832006177 +0100
+++ linux-2.6/fs/reiserfs/super.c 2010-02-20 11:59:10.746276675 +0100
@@ -580,7 +580,7 @@ out:
static void reiserfs_clear_inode(struct inode *inode)
{
- vfs_dq_drop(inode);
+ dquot_drop(inode);
}
#ifdef CONFIG_QUOTA
@@ -623,7 +623,6 @@ static int reiserfs_quota_on(struct supe
static const struct dquot_operations reiserfs_quota_operations = {
.initialize = dquot_initialize,
- .drop = dquot_drop,
.write_dquot = reiserfs_write_dquot,
.acquire_dquot = reiserfs_acquire_dquot,
.release_dquot = reiserfs_release_dquot,
Index: linux-2.6/fs/ext2/ialloc.c
===================================================================
--- linux-2.6.orig/fs/ext2/ialloc.c 2010-02-20 11:48:48.700024475 +0100
+++ linux-2.6/fs/ext2/ialloc.c 2010-02-20 11:59:10.751275697 +0100
@@ -122,7 +122,7 @@ void ext2_free_inode (struct inode * ino
/* Quota is already initialized in iput() */
ext2_xattr_delete_inode(inode);
dquot_free_inode(inode);
- vfs_dq_drop(inode);
+ dquot_drop(inode);
}
es = EXT2_SB(sb)->s_es;
@@ -609,7 +609,7 @@ fail_free_drop:
dquot_free_inode(inode);
fail_drop:
- vfs_dq_drop(inode);
+ dquot_drop(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
unlock_new_inode(inode);
Index: linux-2.6/fs/ext3/ialloc.c
===================================================================
--- linux-2.6.orig/fs/ext3/ialloc.c 2010-02-20 11:48:48.704006037 +0100
+++ linux-2.6/fs/ext3/ialloc.c 2010-02-20 11:59:10.755255373 +0100
@@ -126,7 +126,7 @@ void ext3_free_inode (handle_t *handle,
vfs_dq_init(inode);
ext3_xattr_delete_inode(handle, inode);
dquot_free_inode(inode);
- vfs_dq_drop(inode);
+ dquot_drop(inode);
is_directory = S_ISDIR(inode->i_mode);
@@ -623,7 +623,7 @@ fail_free_drop:
dquot_free_inode(inode);
fail_drop:
- vfs_dq_drop(inode);
+ dquot_drop(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
unlock_new_inode(inode);
Index: linux-2.6/fs/ext4/ialloc.c
===================================================================
--- linux-2.6.orig/fs/ext4/ialloc.c 2010-02-20 11:48:48.707005688 +0100
+++ linux-2.6/fs/ext4/ialloc.c 2010-02-20 11:59:10.764254954 +0100
@@ -220,7 +220,7 @@ void ext4_free_inode(handle_t *handle, s
vfs_dq_init(inode);
ext4_xattr_delete_inode(handle, inode);
dquot_free_inode(inode);
- vfs_dq_drop(inode);
+ dquot_drop(inode);
is_directory = S_ISDIR(inode->i_mode);
@@ -1078,7 +1078,7 @@ fail_free_drop:
dquot_free_inode(inode);
fail_drop:
- vfs_dq_drop(inode);
+ dquot_drop(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
unlock_new_inode(inode);
Index: linux-2.6/fs/jfs/inode.c
===================================================================
--- linux-2.6.orig/fs/jfs/inode.c 2010-02-20 11:48:48.713005548 +0100
+++ linux-2.6/fs/jfs/inode.c 2010-02-20 11:59:10.775005758 +0100
@@ -160,7 +160,7 @@ void jfs_delete_inode(struct inode *inod
*/
vfs_dq_init(inode);
dquot_free_inode(inode);
- vfs_dq_drop(inode);
+ dquot_drop(inode);
}
clear_inode(inode);
Index: linux-2.6/fs/jfs/jfs_inode.c
===================================================================
--- linux-2.6.orig/fs/jfs/jfs_inode.c 2010-02-20 11:48:48.718033206 +0100
+++ linux-2.6/fs/jfs/jfs_inode.c 2010-02-20 11:59:10.780255583 +0100
@@ -163,7 +163,7 @@ struct inode *ialloc(struct inode *paren
return inode;
fail_drop:
- vfs_dq_drop(inode);
+ dquot_drop(inode);
inode->i_flags |= S_NOQUOTA;
fail_unlock:
inode->i_nlink = 0;
Index: linux-2.6/fs/quota/dquot.c
===================================================================
--- linux-2.6.orig/fs/quota/dquot.c 2010-02-20 11:55:53.742255234 +0100
+++ linux-2.6/fs/quota/dquot.c 2010-02-20 11:59:10.787005967 +0100
@@ -1358,7 +1358,7 @@ EXPORT_SYMBOL(dquot_initialize);
/*
* Release all quotas referenced by inode
*/
-int dquot_drop(struct inode *inode)
+static void __dquot_drop(struct inode *inode)
{
int cnt;
struct dquot *put[MAXQUOTAS];
@@ -1370,32 +1370,31 @@ int dquot_drop(struct inode *inode)
}
up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
dqput_all(put);
- return 0;
}
-EXPORT_SYMBOL(dquot_drop);
-/* Wrapper to remove references to quota structures from inode */
-void vfs_dq_drop(struct inode *inode)
+void dquot_drop(struct inode *inode)
{
- /* Here we can get arbitrary inode from clear_inode() so we have
- * to be careful. OTOH we don't need locking as quota operations
- * are allowed to change only at mount time */
- if (!IS_NOQUOTA(inode) && inode->i_sb && inode->i_sb->dq_op
- && inode->i_sb->dq_op->drop) {
- int cnt;
- /* Test before calling to rule out calls from proc and such
- * where we are not allowed to block. Note that this is
- * actually reliable test even without the lock - the caller
- * must assure that nobody can come after the DQUOT_DROP and
- * add quota pointers back anyway */
- for (cnt = 0; cnt < MAXQUOTAS; cnt++)
- if (inode->i_dquot[cnt])
- break;
- if (cnt < MAXQUOTAS)
- inode->i_sb->dq_op->drop(inode);
+ int cnt;
+
+ if (IS_NOQUOTA(inode))
+ return;
+
+ /*
+ * Test before calling to rule out calls from proc and such
+ * where we are not allowed to block. Note that this is
+ * actually reliable test even without the lock - the caller
+ * must assure that nobody can come after the DQUOT_DROP and
+ * add quota pointers back anyway.
+ */
+ for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
+ if (inode->i_dquot[cnt])
+ break;
}
+
+ if (cnt < MAXQUOTAS)
+ __dquot_drop(inode);
}
-EXPORT_SYMBOL(vfs_dq_drop);
+EXPORT_SYMBOL(dquot_drop);
/*
* inode_reserved_space is managed internally by quota, and protected by
@@ -1812,7 +1811,6 @@ EXPORT_SYMBOL(dquot_commit_info);
*/
const struct dquot_operations dquot_operations = {
.initialize = dquot_initialize,
- .drop = dquot_drop,
.write_dquot = dquot_commit,
.acquire_dquot = dquot_acquire,
.release_dquot = dquot_release,
@@ -2027,7 +2025,7 @@ static int vfs_load_quota_inode(struct i
* When S_NOQUOTA is set, remove dquot references as no more
* references can be added
*/
- sb->dq_op->drop(inode);
+ __dquot_drop(inode);
}
error = -EIO;
Index: linux-2.6/fs/reiserfs/inode.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/inode.c 2010-02-20 11:55:53.847006037 +0100
+++ linux-2.6/fs/reiserfs/inode.c 2010-02-20 11:59:10.802007224 +0100
@@ -1965,7 +1965,7 @@ int reiserfs_new_inode(struct reiserfs_t
out_end_trans:
journal_end(th, th->t_super, th->t_blocks_allocated);
/* Drop can be outside and it needs more credits so it's better to have it outside */
- vfs_dq_drop(inode);
+ dquot_drop(inode);
inode->i_flags |= S_NOQUOTA;
make_bad_inode(inode);
Index: linux-2.6/fs/reiserfs/namei.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/namei.c 2010-02-20 11:40:49.040003731 +0100
+++ linux-2.6/fs/reiserfs/namei.c 2010-02-20 11:59:10.814006596 +0100
@@ -546,7 +546,7 @@ static int reiserfs_add_entry(struct rei
*/
static int drop_new_inode(struct inode *inode)
{
- vfs_dq_drop(inode);
+ dquot_drop(inode);
make_bad_inode(inode);
inode->i_flags |= S_NOQUOTA;
iput(inode);
Index: linux-2.6/fs/udf/ialloc.c
===================================================================
--- linux-2.6.orig/fs/udf/ialloc.c 2010-02-20 11:48:48.752005967 +0100
+++ linux-2.6/fs/udf/ialloc.c 2010-02-20 11:59:10.818035510 +0100
@@ -37,7 +37,7 @@ void udf_free_inode(struct inode *inode)
* as writing the quota to disk may need the lock as well.
*/
dquot_free_inode(inode);
- vfs_dq_drop(inode);
+ dquot_drop(inode);
clear_inode(inode);
@@ -155,7 +155,7 @@ struct inode *udf_new_inode(struct inode
vfs_dq_init(inode);
if (dquot_alloc_inode(inode)) {
- vfs_dq_drop(inode);
+ dquot_drop(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
Index: linux-2.6/fs/ufs/ialloc.c
===================================================================
--- linux-2.6.orig/fs/ufs/ialloc.c 2010-02-20 11:48:48.755040748 +0100
+++ linux-2.6/fs/ufs/ialloc.c 2010-02-20 11:59:10.819293437 +0100
@@ -96,7 +96,7 @@ void ufs_free_inode (struct inode * inod
is_directory = S_ISDIR(inode->i_mode);
dquot_free_inode(inode);
- vfs_dq_drop(inode);
+ dquot_drop(inode);
clear_inode (inode);
@@ -357,7 +357,7 @@ cg_found:
vfs_dq_init(inode);
if (dquot_alloc_inode(inode)) {
- vfs_dq_drop(inode);
+ dquot_drop(inode);
err = -EDQUOT;
goto fail_without_unlock;
}
Index: linux-2.6/include/linux/quotaops.h
===================================================================
--- linux-2.6.orig/include/linux/quotaops.h 2010-02-20 11:55:53.763255583 +0100
+++ linux-2.6/include/linux/quotaops.h 2010-02-20 11:59:10.821253697 +0100
@@ -24,7 +24,7 @@ void inode_claim_rsv_space(struct inode
void inode_sub_rsv_space(struct inode *inode, qsize_t number);
int dquot_initialize(struct inode *inode, int type);
-int dquot_drop(struct inode *inode);
+void dquot_drop(struct inode *inode);
struct dquot *dqget(struct super_block *sb, unsigned int id, int type);
void dqput(struct dquot *dquot);
int dquot_scan_active(struct super_block *sb,
@@ -64,7 +64,6 @@ int vfs_set_dqinfo(struct super_block *s
int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di);
int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di);
-void vfs_dq_drop(struct inode *inode);
int dquot_transfer(struct inode *inode, struct iattr *iattr);
int vfs_dq_quota_on_remount(struct super_block *sb);
@@ -210,7 +209,7 @@ static inline void vfs_dq_init(struct in
{
}
-static inline void vfs_dq_drop(struct inode *inode)
+static inline void dquot_drop(struct inode *inode)
{
}
Index: linux-2.6/fs/ocfs2/quota_global.c
===================================================================
--- linux-2.6.orig/fs/ocfs2/quota_global.c 2010-02-20 11:55:53.733255653 +0100
+++ linux-2.6/fs/ocfs2/quota_global.c 2010-02-20 11:59:10.823282332 +0100
@@ -852,7 +852,6 @@ static void ocfs2_destroy_dquot(struct d
const struct dquot_operations ocfs2_quota_operations = {
.initialize = dquot_initialize,
- .drop = dquot_drop,
.write_dquot = ocfs2_write_dquot,
.acquire_dquot = ocfs2_acquire_dquot,
.release_dquot = ocfs2_release_dquot,
Index: linux-2.6/Documentation/filesystems/Locking
===================================================================
--- linux-2.6.orig/Documentation/filesystems/Locking 2010-02-20 11:55:53.694023148 +0100
+++ linux-2.6/Documentation/filesystems/Locking 2010-02-20 11:59:10.826282123 +0100
@@ -461,7 +461,6 @@ in sys_read() and friends.
--------------------------- dquot_operations -------------------------------
prototypes:
int (*initialize) (struct inode *, int);
- int (*drop) (struct inode *);
int (*write_dquot) (struct dquot *);
int (*acquire_dquot) (struct dquot *);
int (*release_dquot) (struct dquot *);
@@ -475,7 +474,6 @@ What filesystem should expect from the g
FS recursion Held locks when called
initialize: yes maybe dqonoff_sem
-drop: yes -
write_dquot: yes dqonoff_sem or dqptr_sem
acquire_dquot: yes dqonoff_sem or dqptr_sem
release_dquot: yes dqonoff_sem or dqptr_sem
Index: linux-2.6/include/linux/quota.h
===================================================================
--- linux-2.6.orig/include/linux/quota.h 2010-02-20 11:55:53.761255862 +0100
+++ linux-2.6/include/linux/quota.h 2010-02-20 11:59:10.833269202 +0100
@@ -296,7 +296,6 @@ struct quota_format_ops {
/* Operations working with dquots */
struct dquot_operations {
int (*initialize) (struct inode *, int);
- int (*drop) (struct inode *);
int (*write_dquot) (struct dquot *); /* Ordinary dquot write */
struct dquot *(*alloc_dquot)(struct super_block *, int); /* Allocate memory for new dquot */
void (*destroy_dquot)(struct dquot *); /* Free memory for dquot */
Index: linux-2.6/fs/ext2/super.c
===================================================================
--- linux-2.6.orig/fs/ext2/super.c 2010-02-20 11:58:09.774023498 +0100
+++ linux-2.6/fs/ext2/super.c 2010-02-20 11:59:10.840255164 +0100
@@ -195,7 +195,7 @@ static void ext2_clear_inode(struct inod
{
struct ext2_block_alloc_info *rsv = EXT2_I(inode)->i_block_alloc_info;
- vfs_dq_drop(inode);
+ dquot_drop(inode);
ext2_discard_reservation(inode);
EXT2_I(inode)->i_block_alloc_info = NULL;
if (unlikely(rsv))
Index: linux-2.6/fs/jfs/super.c
===================================================================
--- linux-2.6.orig/fs/jfs/super.c 2010-02-20 11:58:09.812006247 +0100
+++ linux-2.6/fs/jfs/super.c 2010-02-20 11:59:10.853017421 +0100
@@ -133,7 +133,7 @@ static void jfs_destroy_inode(struct ino
static void jfs_clear_inode(struct inode *inode)
{
- vfs_dq_drop(inode);
+ dquot_drop(inode);
}
static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)
Index: linux-2.6/fs/ocfs2/inode.c
===================================================================
--- linux-2.6.orig/fs/ocfs2/inode.c 2010-02-20 11:58:09.821281005 +0100
+++ linux-2.6/fs/ocfs2/inode.c 2010-02-20 11:59:10.860254535 +0100
@@ -1087,7 +1087,7 @@ void ocfs2_clear_inode(struct inode *ino
mlog_bug_on_msg(OCFS2_SB(inode->i_sb) == NULL,
"Inode=%lu\n", inode->i_ino);
- vfs_dq_drop(inode);
+ dquot_drop(inode);
/* To preven remote deletes we hold open lock before, now it
* is time to unlock PR and EX open locks. */
Index: linux-2.6/fs/ufs/super.c
===================================================================
--- linux-2.6.orig/fs/ufs/super.c 2010-02-20 11:58:09.845005897 +0100
+++ linux-2.6/fs/ufs/super.c 2010-02-20 11:59:10.870255373 +0100
@@ -1434,7 +1434,7 @@ static void destroy_inodecache(void)
static void ufs_clear_inode(struct inode *inode)
{
- vfs_dq_drop(inode);
+ dquot_drop(inode);
}
#ifdef CONFIG_QUOTA
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
