quota: Add helpers to allow ocfs2 specific quota initialization and freeing
Jan Kara
reviewerPATCH 1/1 quota: Add helpers to allow ocfs2 specific quota initialization and freeing
OCFS2 needs to peek whether quota structure is already in memory so that it can avoid expensive cluster locking in that case. Similarly when freeing dquots, it checks whether it is the last quota structure user or not.
--- fs/dquot.c | 30 ++++++++++++++++++++++++++++-- include/linux/quotaops.h | 2 ++ 2 files changed, 30 insertions(+), 2 deletions(-)
fs/dquot.c +28 -2
@@ -660,6 +660,24 @@ static struct dquot *get_empty_dquot(struct super_block *sb, int type) }/* +* Check whether dquot is in memory. +* MUST be called with either dqptr_sem or dqonoff_mutex held +*/ +int dquot_is_cached (struct super_block *sb,unsigned int id,int type) +{ +unsigned int hashent =hashfn (sb, id, type); +int ret =0 ; + +if (!sb_has_quota_active (sb, type)) +return 0 ; +spin_lock (&dq_list_lock); +if (find_dquot (hashent, sb, id, type) ==NODQUOT ) + ret =1 ; +spin_unlock (&dq_list_lock); +return ret; +} + +/* * Get reference to dquot * MUST be called with either dqptr_sem or dqonoff_mutex held */
@@ -1184,17 +1202,23 @@ out_err:* Release all quotas referenced by inode * Transaction must be started at an entry */ -int dquot_drop (struct inode *inode) +int dquot_drop_locked (struct inode *inode) {int cnt; -down_write (&sb_dqopt (inode->i_sb)->dqptr_sem);for (cnt =0 ; cnt <MAXQUOTAS ; cnt++) {if (inode->i_dquot[cnt] !=NODQUOT ) {dqput (inode->i_dquot[cnt]); inode->i_dquot[cnt] =NODQUOT ; } } +return 0 ; +} + +int dquot_drop (struct inode *inode) +{ +down_write (&sb_dqopt (inode->i_sb)->dqptr_sem); +dquot_drop_locked (inode);up_write (&sb_dqopt (inode->i_sb)->dqptr_sem);return 0 ; }
@@ -2306,7 +2330,9 @@ EXPORT_SYMBOL(dquot_release);EXPORT_SYMBOL (dquot_mark_dquot_dirty);EXPORT_SYMBOL (dquot_initialize);EXPORT_SYMBOL (dquot_drop); +EXPORT_SYMBOL (dquot_drop_locked);EXPORT_SYMBOL (vfs_dq_drop); +EXPORT_SYMBOL (dquot_is_cached);EXPORT_SYMBOL (dquot_alloc_space);EXPORT_SYMBOL (dquot_alloc_inode);EXPORT_SYMBOL (dquot_free_space);
include/linux/quotaops.h +2 -0
@@ -27,6 +27,8 @@ void sync_dquots(struct super_block *sb, int type);int dquot_initialize (struct inode *inode,int type);int dquot_drop (struct inode *inode); +int dquot_drop_locked (struct inode *inode); +int dquot_is_cached (struct super_block *sb,unsigned int id,int type);int dquot_alloc_space (struct inode *inode,qsize_t number,int prealloc);int dquot_alloc_inode (const struct inode *inode,qsize_t number);
Signature · 1 line
1.5.2.4
PATCH 1/1 quota: Add helpers to allow ocfs2 specific quota initialization and freeing
Quoted 25 lines · Jan Kara
OCFS2 needs to peek whether quota structure is already in memory so that it can avoid expensive cluster locking in that case. Similarly when freeing dquots, it checks whether it is the last quota structure user or not.
Signed-off-by Jan Kara <[email protected]>--- fs/dquot.c | 30 ++++++++++++++++++++++++++++-- include/linux/quotaops.h | 2 ++ 2 files changed, 30 insertions(+), 2 deletions(-)fs/dquot.c +6
-0@@ -660,6 +660,24 @@ static struct dquot *get_empty_dquot(struct super_block *sb, int type) }/* +* Check whether dquot is in memory. +* MUST be called with either dqptr_sem or dqonoff_mutex held +*/ +int dquot_is_cached (struct super_block *sb,unsigned int id,int type) +{ +unsigned int hashent =hashfn (sb, id, type);
fs/dquot.c static struct dquot *get_empty_dquot(struct super_block *sb, int type) · line 678
Quoted 10 lines
fs/dquot.c +10
-0+int ret =0 ; + +if (!sb_has_quota_active (sb, type)) +return 0 ; +spin_lock (&dq_list_lock); +if (find_dquot (hashent, sb, id, type) ==NODQUOT ) + ret =1 ; +spin_unlock (&dq_list_lock); +return ret; +}
I may have this backwards, but should that be "!= NODQUOT"? As
far as I can tell, NODQUOT means "not found", and returning 1 means "found".
Joel
Signature · 9 lines
"The doctrine of human equality reposes on this: that there is no man really clever who has not found that he is stupid." - Gilbert K. Chesterson Joel Becker Principal Software Developer Oracle E-mail: joel.becker at oracle.com Phone: (650) 506-8127
Jan Kara
reviewerPATCH 1/1 quota: Add helpers to allow ocfs2 specific quota initialization and freeing
Quoted 38 lines · Joel Becker
Quoted 25 lines · Jan Kara
OCFS2 needs to peek whether quota structure is already in memory so that it can avoid expensive cluster locking in that case. Similarly when freeing dquots, it checks whether it is the last quota structure user or not.
Signed-off-by Jan Kara <[email protected]>--- fs/dquot.c | 30 ++++++++++++++++++++++++++++-- include/linux/quotaops.h | 2 ++ 2 files changed, 30 insertions(+), 2 deletions(-)fs/dquot.c +6
-0@@ -660,6 +660,24 @@ static struct dquot *get_empty_dquot(struct super_block *sb, int type) }/* +* Check whether dquot is in memory. +* MUST be called with either dqptr_sem or dqonoff_mutex held +*/ +int dquot_is_cached (struct super_block *sb,unsigned int id,int type) +{ +unsigned int hashent =hashfn (sb, id, type);fs/dquot.c static struct dquot *get_empty_dquot(struct super_block *sb, int type) · line 678
Quoted 10 lines
fs/dquot.c +10
-0+int ret =0 ; + +if (!sb_has_quota_active (sb, type)) +return 0 ; +spin_lock (&dq_list_lock); +if (find_dquot (hashent, sb, id, type) ==NODQUOT ) + ret =1 ; +spin_unlock (&dq_list_lock); +return ret; +}I may have this backwards, but should that be "!= NODQUOT"? As
Quoted 2 lines
far as I can tell, NODQUOT means "not found", and returning 1 means "found".
Of course, you are right. Thanks for catching this. Fixed.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR