UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

dquot: cleanup dquot drop routine 

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@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Christoph Hellwig 2010-03-03 09:05:05 -05:00 committed by Jan Kara
parent 257ba15ced
commit 9f75475802
22 changed files with 49 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/filesystems/Locking
View File

@ -461,7 +461,6 @@ in sys_read() and friends.
--------------------------- dquot_operations ------------------------------- --------------------------- dquot_operations -------------------------------
prototypes: prototypes:
int (*initialize) (struct inode *, int); int (*initialize) (struct inode *, int);
int (*drop) (struct inode *);
int (*write_dquot) (struct dquot *); int (*write_dquot) (struct dquot *);
int (*acquire_dquot) (struct dquot *); int (*acquire_dquot) (struct dquot *);
int (*release_dquot) (struct dquot *); int (*release_dquot) (struct dquot *);
@ -475,7 +474,6 @@ What filesystem should expect from the generic quota functions:
FS recursion Held locks when called FS recursion Held locks when called
initialize: yes maybe dqonoff_sem initialize: yes maybe dqonoff_sem
drop: yes -
write_dquot: yes dqonoff_sem or dqptr_sem write_dquot: yes dqonoff_sem or dqptr_sem
acquire_dquot: yes dqonoff_sem or dqptr_sem acquire_dquot: yes dqonoff_sem or dqptr_sem
release_dquot: yes dqonoff_sem or dqptr_sem release_dquot: yes dqonoff_sem or dqptr_sem

4
fs/ext2/ialloc.c
View File

@ -122,7 +122,7 @@ void ext2_free_inode (struct inode * inode)
/* Quota is already initialized in iput() */ /* Quota is already initialized in iput() */
ext2_xattr_delete_inode(inode); ext2_xattr_delete_inode(inode);
dquot_free_inode(inode); dquot_free_inode(inode);
vfs_dq_drop(inode); dquot_drop(inode);
} }
es = EXT2_SB(sb)->s_es; es = EXT2_SB(sb)->s_es;
@ -608,7 +608,7 @@ fail_free_drop:
dquot_free_inode(inode); dquot_free_inode(inode);
fail_drop: fail_drop:
vfs_dq_drop(inode); dquot_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0; inode->i_nlink = 0;
unlock_new_inode(inode); unlock_new_inode(inode);

2
fs/ext2/super.c
View File

@ -195,7 +195,7 @@ static void ext2_clear_inode(struct inode *inode)
{ {
struct ext2_block_alloc_info *rsv = EXT2_I(inode)->i_block_alloc_info; 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_discard_reservation(inode);
EXT2_I(inode)->i_block_alloc_info = NULL; EXT2_I(inode)->i_block_alloc_info = NULL;
if (unlikely(rsv)) if (unlikely(rsv))

4
fs/ext3/ialloc.c
View File

@ -126,7 +126,7 @@ void ext3_free_inode (handle_t *handle, struct inode * inode)
vfs_dq_init(inode); vfs_dq_init(inode);
ext3_xattr_delete_inode(handle, inode); ext3_xattr_delete_inode(handle, inode);
dquot_free_inode(inode); dquot_free_inode(inode);
vfs_dq_drop(inode); dquot_drop(inode);
is_directory = S_ISDIR(inode->i_mode); is_directory = S_ISDIR(inode->i_mode);
@ -622,7 +622,7 @@ fail_free_drop:
dquot_free_inode(inode); dquot_free_inode(inode);
fail_drop: fail_drop:
vfs_dq_drop(inode); dquot_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0; inode->i_nlink = 0;
unlock_new_inode(inode); unlock_new_inode(inode);

3
fs/ext3/super.c
View File

@ -529,7 +529,7 @@ static void ext3_clear_inode(struct inode *inode)
{ {
struct ext3_block_alloc_info *rsv = EXT3_I(inode)->i_block_alloc_info; 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_discard_reservation(inode);
EXT3_I(inode)->i_block_alloc_info = NULL; EXT3_I(inode)->i_block_alloc_info = NULL;
if (unlikely(rsv)) if (unlikely(rsv))
@ -753,7 +753,6 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type,
static const struct dquot_operations ext3_quota_operations = { static const struct dquot_operations ext3_quota_operations = {
.initialize = dquot_initialize, .initialize = dquot_initialize,
.drop = dquot_drop,
.write_dquot = ext3_write_dquot, .write_dquot = ext3_write_dquot,
.acquire_dquot = ext3_acquire_dquot, .acquire_dquot = ext3_acquire_dquot,
.release_dquot = ext3_release_dquot, .release_dquot = ext3_release_dquot,

4
fs/ext4/ialloc.c
View File

@ -220,7 +220,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
vfs_dq_init(inode); vfs_dq_init(inode);
ext4_xattr_delete_inode(handle, inode); ext4_xattr_delete_inode(handle, inode);
dquot_free_inode(inode); dquot_free_inode(inode);
vfs_dq_drop(inode); dquot_drop(inode);
is_directory = S_ISDIR(inode->i_mode); is_directory = S_ISDIR(inode->i_mode);
@ -1077,7 +1077,7 @@ fail_free_drop:
dquot_free_inode(inode); dquot_free_inode(inode);
fail_drop: fail_drop:
vfs_dq_drop(inode); dquot_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0; inode->i_nlink = 0;
unlock_new_inode(inode); unlock_new_inode(inode);

3
fs/ext4/super.c
View File

@ -761,7 +761,7 @@ static void destroy_inodecache(void)
static void ext4_clear_inode(struct inode *inode) static void ext4_clear_inode(struct inode *inode)
{ {
vfs_dq_drop(inode); dquot_drop(inode);
ext4_discard_preallocations(inode); ext4_discard_preallocations(inode);
if (EXT4_JOURNAL(inode)) if (EXT4_JOURNAL(inode))
jbd2_journal_release_jbd_inode(EXT4_SB(inode->i_sb)->s_journal, jbd2_journal_release_jbd_inode(EXT4_SB(inode->i_sb)->s_journal,
@ -1014,7 +1014,6 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
static const struct dquot_operations ext4_quota_operations = { static const struct dquot_operations ext4_quota_operations = {
.initialize = dquot_initialize, .initialize = dquot_initialize,
.drop = dquot_drop,
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
.get_reserved_space = ext4_get_reserved_space, .get_reserved_space = ext4_get_reserved_space,
#endif #endif

2
fs/jfs/inode.c
View File

@ -160,7 +160,7 @@ void jfs_delete_inode(struct inode *inode)
*/ */
vfs_dq_init(inode); vfs_dq_init(inode);
dquot_free_inode(inode); dquot_free_inode(inode);
vfs_dq_drop(inode); dquot_drop(inode);
} }
clear_inode(inode); clear_inode(inode);

2
fs/jfs/jfs_inode.c
View File

@ -162,7 +162,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
return inode; return inode;
fail_drop: fail_drop:
vfs_dq_drop(inode); dquot_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
fail_unlock: fail_unlock:
inode->i_nlink = 0; inode->i_nlink = 0;

2
fs/jfs/super.c
View File

@ -133,7 +133,7 @@ static void jfs_destroy_inode(struct inode *inode)
static void jfs_clear_inode(struct inode *inode) 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) static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)

2
fs/ocfs2/inode.c
View File

@ -1087,7 +1087,7 @@ void ocfs2_clear_inode(struct inode *inode)
mlog_bug_on_msg(OCFS2_SB(inode->i_sb) == NULL, mlog_bug_on_msg(OCFS2_SB(inode->i_sb) == NULL,
"Inode=%lu\n", inode->i_ino); "Inode=%lu\n", inode->i_ino);
vfs_dq_drop(inode); dquot_drop(inode);
/* To preven remote deletes we hold open lock before, now it /* To preven remote deletes we hold open lock before, now it
* is time to unlock PR and EX open locks. */ * is time to unlock PR and EX open locks. */

1
fs/ocfs2/quota_global.c
View File

@ -852,7 +852,6 @@ static void ocfs2_destroy_dquot(struct dquot *dquot)
const struct dquot_operations ocfs2_quota_operations = { const struct dquot_operations ocfs2_quota_operations = {
.initialize = dquot_initialize, .initialize = dquot_initialize,
.drop = dquot_drop,
.write_dquot = ocfs2_write_dquot, .write_dquot = ocfs2_write_dquot,
.acquire_dquot = ocfs2_acquire_dquot, .acquire_dquot = ocfs2_acquire_dquot,
.release_dquot = ocfs2_release_dquot, .release_dquot = ocfs2_release_dquot,

52
fs/quota/dquot.c
View File

@ -1358,7 +1358,7 @@ EXPORT_SYMBOL(dquot_initialize);
/* /*
* Release all quotas referenced by inode * Release all quotas referenced by inode
*/ */
int dquot_drop(struct inode *inode) static void __dquot_drop(struct inode *inode)
{ {
int cnt; int cnt;
struct dquot *put[MAXQUOTAS]; struct dquot *put[MAXQUOTAS];
@ -1370,33 +1370,32 @@ int dquot_drop(struct inode *inode)
} }
up_write(&sb_dqopt(inode->i_sb)->dqptr_sem); up_write(&sb_dqopt(inode->i_sb)->dqptr_sem);
dqput_all(put); dqput_all(put);
return 0; }
void dquot_drop(struct inode *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(dquot_drop); EXPORT_SYMBOL(dquot_drop);
/* Wrapper to remove references to quota structures from inode */
void vfs_dq_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);
}
}
EXPORT_SYMBOL(vfs_dq_drop);
/* /*
* inode_reserved_space is managed internally by quota, and protected by * inode_reserved_space is managed internally by quota, and protected by
* i_lock similar to i_blocks+i_bytes. * i_lock similar to i_blocks+i_bytes.
@ -1812,7 +1811,6 @@ EXPORT_SYMBOL(dquot_commit_info);
*/ */
const struct dquot_operations dquot_operations = { const struct dquot_operations dquot_operations = {
.initialize = dquot_initialize, .initialize = dquot_initialize,
.drop = dquot_drop,
.write_dquot = dquot_commit, .write_dquot = dquot_commit,
.acquire_dquot = dquot_acquire, .acquire_dquot = dquot_acquire,
.release_dquot = dquot_release, .release_dquot = dquot_release,
@ -2029,7 +2027,7 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
* When S_NOQUOTA is set, remove dquot references as no more * When S_NOQUOTA is set, remove dquot references as no more
* references can be added * references can be added
*/ */
sb->dq_op->drop(inode); __dquot_drop(inode);
} }
error = -EIO; error = -EIO;

2
fs/reiserfs/inode.c
View File

@ -1964,7 +1964,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
out_end_trans: out_end_trans:
journal_end(th, th->t_super, th->t_blocks_allocated); 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 */ /* 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; inode->i_flags |= S_NOQUOTA;
make_bad_inode(inode); make_bad_inode(inode);

2
fs/reiserfs/namei.c
View File

@ -546,7 +546,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
*/ */
static int drop_new_inode(struct inode *inode) static int drop_new_inode(struct inode *inode)
{ {
vfs_dq_drop(inode); dquot_drop(inode);
make_bad_inode(inode); make_bad_inode(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
iput(inode); iput(inode);

3
fs/reiserfs/super.c
View File

@ -580,7 +580,7 @@ out:
static void reiserfs_clear_inode(struct inode *inode) static void reiserfs_clear_inode(struct inode *inode)
{ {
vfs_dq_drop(inode); dquot_drop(inode);
} }
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
@ -623,7 +623,6 @@ static int reiserfs_quota_on(struct super_block *, int, int, char *, int);
static const struct dquot_operations reiserfs_quota_operations = { static const struct dquot_operations reiserfs_quota_operations = {
.initialize = dquot_initialize, .initialize = dquot_initialize,
.drop = dquot_drop,
.write_dquot = reiserfs_write_dquot, .write_dquot = reiserfs_write_dquot,
.acquire_dquot = reiserfs_acquire_dquot, .acquire_dquot = reiserfs_acquire_dquot,
.release_dquot = reiserfs_release_dquot, .release_dquot = reiserfs_release_dquot,

4
fs/udf/ialloc.c
View File

@ -37,7 +37,7 @@ void udf_free_inode(struct inode *inode)
* as writing the quota to disk may need the lock as well. * as writing the quota to disk may need the lock as well.
*/ */
dquot_free_inode(inode); dquot_free_inode(inode);
vfs_dq_drop(inode); dquot_drop(inode);
clear_inode(inode); clear_inode(inode);
@ -156,7 +156,7 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
vfs_dq_init(inode); vfs_dq_init(inode);
ret = dquot_alloc_inode(inode); ret = dquot_alloc_inode(inode);
if (ret) { if (ret) {
vfs_dq_drop(inode); dquot_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0; inode->i_nlink = 0;
iput(inode); iput(inode);

2
fs/udf/inode.c
View File

@ -109,7 +109,7 @@ void udf_clear_inode(struct inode *inode)
(unsigned long long)iinfo->i_lenExtents); (unsigned long long)iinfo->i_lenExtents);
} }
vfs_dq_drop(inode); dquot_drop(inode);
kfree(iinfo->i_ext.i_data); kfree(iinfo->i_ext.i_data);
iinfo->i_ext.i_data = NULL; iinfo->i_ext.i_data = NULL;
} }

4
fs/ufs/ialloc.c
View File

@ -96,7 +96,7 @@ void ufs_free_inode (struct inode * inode)
is_directory = S_ISDIR(inode->i_mode); is_directory = S_ISDIR(inode->i_mode);
dquot_free_inode(inode); dquot_free_inode(inode);
vfs_dq_drop(inode); dquot_drop(inode);
clear_inode (inode); clear_inode (inode);
@ -358,7 +358,7 @@ cg_found:
vfs_dq_init(inode); vfs_dq_init(inode);
err = dquot_alloc_inode(inode); err = dquot_alloc_inode(inode);
if (err) { if (err) {
vfs_dq_drop(inode); dquot_drop(inode);
goto fail_without_unlock; goto fail_without_unlock;
} }

2
fs/ufs/super.c
View File

@ -1434,7 +1434,7 @@ static void destroy_inodecache(void)
static void ufs_clear_inode(struct inode *inode) static void ufs_clear_inode(struct inode *inode)
{ {
vfs_dq_drop(inode); dquot_drop(inode);
} }
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA

1
include/linux/quota.h
View File

@ -296,7 +296,6 @@ struct quota_format_ops {
/* Operations working with dquots */ /* Operations working with dquots */
struct dquot_operations { struct dquot_operations {
int (*initialize) (struct inode *, int); int (*initialize) (struct inode *, int);
int (*drop) (struct inode *);
int (*write_dquot) (struct dquot *); /* Ordinary dquot write */ int (*write_dquot) (struct dquot *); /* Ordinary dquot write */
struct dquot *(*alloc_dquot)(struct super_block *, int); /* Allocate memory for new dquot */ struct dquot *(*alloc_dquot)(struct super_block *, int); /* Allocate memory for new dquot */
void (*destroy_dquot)(struct dquot *); /* Free memory for dquot */ void (*destroy_dquot)(struct dquot *); /* Free memory for dquot */

5
include/linux/quotaops.h
View File

@ -24,7 +24,7 @@ void inode_claim_rsv_space(struct inode *inode, qsize_t number);
void inode_sub_rsv_space(struct inode *inode, qsize_t number); void inode_sub_rsv_space(struct inode *inode, qsize_t number);
int dquot_initialize(struct inode *inode, int type); 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); struct dquot *dqget(struct super_block *sb, unsigned int id, int type);
void dqput(struct dquot *dquot); void dqput(struct dquot *dquot);
int dquot_scan_active(struct super_block *sb, int dquot_scan_active(struct super_block *sb,
@ -64,7 +64,6 @@ int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di); 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); 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 dquot_transfer(struct inode *inode, struct iattr *iattr);
int vfs_dq_quota_on_remount(struct super_block *sb); int vfs_dq_quota_on_remount(struct super_block *sb);
@ -210,7 +209,7 @@ static inline void vfs_dq_init(struct inode *inode)
{ {
} }
static inline void vfs_dq_drop(struct inode *inode) static inline void dquot_drop(struct inode *inode)
{ {
} }