From patchwork Thu Apr 8 08:29:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 49706 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 919F7B7D2A for ; Thu, 8 Apr 2010 18:30:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752532Ab0DHIaF (ORCPT ); Thu, 8 Apr 2010 04:30:05 -0400 Received: from mail-bw0-f209.google.com ([209.85.218.209]:44151 "EHLO mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752171Ab0DHIaD (ORCPT ); Thu, 8 Apr 2010 04:30:03 -0400 Received: by bwz1 with SMTP id 1so1562745bwz.21 for ; Thu, 08 Apr 2010 01:30:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer; bh=nLzlEuxQ6tRrlsVarAQrvoWrcDbvq0ZJKLsqCCcCpJE=; b=BRIlvg7k7HV3k7h8StKxUXJ2BW0Tg6Gt9z2nDI97ZXZGZjScUpue1cc7UhYdgAIP07 yV0Fler1+LCj2pIf8ueeR9N6m4wPgpuYKpsCMmueHcgYwSLjjrboVWogp9J1/xX882ZV ih4jpgj3w7JxZd8DRh4rFtUiDKYpVblinOvX4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=Q+wUjdi+18GxkxnaxgNk2L1ivIlsP/TUVCxNiw14PmXY2Y2x9kRpE/HE7MYviO3FmJ Cys0jg/1acH2j344wgAYpgXMm6g63Fwq3pcJeLHUMDnb9Ya6NqRlZ/QjSOmm5/dcBYAE 9X3tPL2o56qSZdPLgRorsz3Slzwxzsh6u/MXc= Received: by 10.204.73.149 with SMTP id q21mr1223271bkj.57.1270715401173; Thu, 08 Apr 2010 01:30:01 -0700 (PDT) Received: from localhost.localdomain (swsoft-msk-nat.sw.ru [195.214.232.10]) by mx.google.com with ESMTPS id 15sm7739335bwz.12.2010.04.08.01.29.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 08 Apr 2010 01:29:30 -0700 (PDT) From: Dmitry Monakhov To: linux-ext4@vger.kernel.org Cc: Dmitry Monakhov Subject: [PATCH] ext4: random performance optimizations for ext4_setattr Date: Thu, 8 Apr 2010 12:29:23 +0400 Message-Id: <1270715363-10958-1-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.6.3.3 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org If quota is not enabled it is not necessery to start separate transaction for uid, gid and quota credits changes. If inode wasn't added to orphan list when it is not necessary to remove it from the list. This allow to avoid locking on per-sb s_orphan_lock mutex. Signed-off-by: Dmitry Monakhov --- fs/ext4/inode.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 3996151..b498274 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5418,6 +5418,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) { struct inode *inode = dentry->d_inode; int error, rc = 0; + int orphan = 0; const unsigned int ia_valid = attr->ia_valid; error = inode_change_ok(inode, attr); @@ -5426,8 +5427,13 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) if (ia_valid & ATTR_SIZE) dquot_initialize(inode); - if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || - (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) { + /* + * If quota is active when uig, git and quota's credits must + * being changed in the one transaction. + */ + if (sb_any_quota_active(inode->i_sb) && !IS_NOQUOTA(inode) && ( + (ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) || + (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))) { handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, @@ -5477,6 +5483,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) } error = ext4_orphan_add(handle, inode); + orphan = 1; EXT4_I(inode)->i_disksize = attr->ia_size; rc = ext4_mark_inode_dirty(handle, inode); if (!error) @@ -5491,9 +5498,11 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) handle = ext4_journal_start(inode, 3); if (IS_ERR(handle)) { ext4_orphan_del(NULL, inode); + orphan = 0; goto err_out; } ext4_orphan_del(handle, inode); + orphan = 0; ext4_journal_stop(handle); goto err_out; } @@ -5508,7 +5517,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) /* If inode_setattr's call to ext4_truncate failed to get a * transaction handle at all, we need to clean up the in-core * orphan list manually. */ - if (inode->i_nlink) + if (orphan && inode->i_nlink) ext4_orphan_del(NULL, inode); if (!rc && (ia_valid & ATTR_MODE))