From 71b77a6d3d605b7730ce12cbf95a902ea84b41ce Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 11 Oct 2010 15:22:21 +0200 Subject: [PATCH] --- yaml --- r: 218833 b: refs/heads/master c: 86f3cbec4a193c04d0a31c13132c5956731af6ff h: refs/heads/master i: 218831: 59ae3c3a89468e5680f2fe7d2ed32f688d0d2f27 v: v3 --- [refs] | 2 +- trunk/fs/quota/dquot.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d7b3f69f284f..245277a99f59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e32784b71c2c84895016ca6ab271591669c02aa +refs/heads/master: 86f3cbec4a193c04d0a31c13132c5956731af6ff diff --git a/trunk/fs/quota/dquot.c b/trunk/fs/quota/dquot.c index ed14beea8fe3..1bc38f56fa7c 100644 --- a/trunk/fs/quota/dquot.c +++ b/trunk/fs/quota/dquot.c @@ -1805,20 +1805,19 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to) mark_all_dquot_dirty(transfer_from); mark_all_dquot_dirty(transfer_to); + flush_warnings(transfer_to, warntype_to); + flush_warnings(transfer_from, warntype_from_inodes); + flush_warnings(transfer_from, warntype_from_space); /* Pass back references to put */ for (cnt = 0; cnt < MAXQUOTAS; cnt++) if (is_valid[cnt]) transfer_to[cnt] = transfer_from[cnt]; - -warn: - flush_warnings(transfer_to, warntype_to); - flush_warnings(transfer_from, warntype_from_inodes); - flush_warnings(transfer_from, warntype_from_space); - return ret; + return 0; over_quota: spin_unlock(&dq_data_lock); up_write(&sb_dqopt(inode->i_sb)->dqptr_sem); - goto warn; + flush_warnings(transfer_to, warntype_to); + return ret; } EXPORT_SYMBOL(__dquot_transfer);