commit 1ea06bec78a128adc995ca32bd906a6c9bb9cf91 Author: Niu Yawei Date: Wed Jun 4 12:20:30 2014 +0800 quota: avoid unnecessary dqget()/dqput() calls Avoid unnecessary dqget()/dqput() calls in __dquot_initialize(), that will introduce global lock contention otherwise. Signed-off-by: Lai Siyao Signed-off-by: Niu Yawei Signed-off-by: Jan Kara Index: linux-3.0.101-0.46_lustre.gbe21584/fs/quota/dquot.c =================================================================== --- linux-3.0.101-0.46_lustre.gbe21584.orig/fs/quota/dquot.c +++ linux-3.0.101-0.46_lustre.gbe21584/fs/quota/dquot.c @@ -1342,7 +1342,7 @@ static int dquot_active(const struct ino static void __dquot_initialize(struct inode *inode, int type) { unsigned int id = 0; - int cnt; + int cnt, init_needed = 0; struct dquot *got[MAXQUOTAS]; struct super_block *sb = inode->i_sb; qsize_t rsv; @@ -1357,6 +1357,15 @@ static void __dquot_initialize(struct in got[cnt] = NULL; if (type != -1 && cnt != type) continue; + /* + * The i_dquot should have been initialized in most cases, + * we check it without locking here to avoid unnecessary + * dqget()/dqput() calls. + */ + if (inode->i_dquot[cnt]) + continue; + init_needed = 1; + switch (cnt) { case USRQUOTA: id = inode->i_uid; @@ -1368,6 +1377,10 @@ static void __dquot_initialize(struct in got[cnt] = dqget(sb, id, cnt); } + /* All required i_dquot has been initialized */ + if (!init_needed) + return; + spin_lock(&inode->i_lock); if (IS_NOQUOTA(inode)) goto out_err;