From patchwork Wed Nov 25 06:57:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 39286 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 6477B1007D1 for ; Wed, 25 Nov 2009 17:57:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752399AbZKYG5l (ORCPT ); Wed, 25 Nov 2009 01:57:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751841AbZKYG5k (ORCPT ); Wed, 25 Nov 2009 01:57:40 -0500 Received: from mail.2ka.mipt.ru ([194.85.80.4]:43482 "EHLO mail.2ka.mipt.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752259AbZKYG5k (ORCPT ); Wed, 25 Nov 2009 01:57:40 -0500 Content-transfer-encoding: 7BIT Received: from localhost.localdomain ([unknown] [10.55.93.124]) by mail.2ka.mipt.ru (Sun Java(tm) System Messaging Server 7u2-7.02 64bit (built Apr 16 2009)) with ESMTPA id <0KTN00EZYKVQR060@mail.2ka.mipt.ru> for linux-ext4@vger.kernel.org; Wed, 25 Nov 2009 10:02:17 +0300 (MSK) From: Dmitry Monakhov To: linux-ext4@vger.kernel.org Cc: Dmitry Monakhov , Jan Kara Subject: [PATCH 4/4] ext4: fix incorrect block reservation on quota transfer. Date: Wed, 25 Nov 2009 09:57:41 +0300 Message-id: <1259132261-16785-4-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.6.0.4 In-reply-to: <1259132261-16785-3-git-send-email-dmonakhov@openvz.org> References: <1259132261-16785-1-git-send-email-dmonakhov@openvz.org> <1259132261-16785-2-git-send-email-dmonakhov@openvz.org> <1259132261-16785-3-git-send-email-dmonakhov@openvz.org> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Inside ->setattr() call both ATTR_UID and ATTR_GID may be valid This means that we may end-up with transferring all quotas. Add we have to reserve QUOTA_DEL_BLOCKS for all quotas, as we do in case of QUOTA_INIT_BLOCKS. Signed-off-by: Dmitry Monakhov Reviewed-by: Mingming Cao --- fs/ext4/inode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 211722b..d42e954 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5439,7 +5439,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) /* (user+group)*(old+new) structure, inode write (sb, * inode block, ? - but truncate inode update has it) */ handle = ext4_journal_start(inode, (EXT4_MAXQUOTAS_INIT_BLOCKS(inode->i_sb)+ - EXT4_QUOTA_DEL_BLOCKS(inode->i_sb))+3); + EXT4_MAXQUOTAS_DEL_BLOCKS(inode->i_sb))+3); if (IS_ERR(handle)) { error = PTR_ERR(handle); goto err_out;