From patchwork Thu Oct 28 08:47:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 69443 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 4381CB70E2 for ; Thu, 28 Oct 2010 19:47:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751420Ab0J1Ir3 (ORCPT ); Thu, 28 Oct 2010 04:47:29 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:40175 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751033Ab0J1Ir3 (ORCPT ); Thu, 28 Oct 2010 04:47:29 -0400 Received: by eye27 with SMTP id 27so1330439eye.19 for ; Thu, 28 Oct 2010 01:47:27 -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:subject :user-agent:date:message-id:mime-version:content-type; bh=iEUY+rszZppzVQsqJa+z+SL91wUKq00teDmNXb/yBT0=; b=p0I+oJJFbDDkjNyYXwUv4jAREd6aerJCp+1ILa8oJIo379ERcYuh7elNgTy6ne6Np5 cCh63/Rifmm7iq3nFLagnqsDIgMGzqoK8Q8l5PeAFqFKNTcGSEPI2NL/Ct6g9qGjGH5r U3IdLNxJo5zyocYK9BrWeRvKfNyUkRb2LAthM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:user-agent:date:message-id:mime-version :content-type; b=mwvO0cVxTP5XWPn+Knaje5I/uC0koay83UxQU6vStOl1QkjH7awPutANrGkjh0ftzF UL02QZqkXTgE57SUW9jMzAlh9fpvtZD4uVho6Fe5l2shB0FhEIh57j0ZDRdwJQ1iuYmJ Xv7NxIQ3+xtnTzwUFfSUe4vBKVLfuGQ5ogJDk= Received: by 10.213.114.83 with SMTP id d19mr9303265ebq.46.1288255647716; Thu, 28 Oct 2010 01:47:27 -0700 (PDT) Received: from smtp.gmail.com (swsoft-msk-nat.sw.ru [195.214.232.10]) by mx.google.com with ESMTPS id x54sm596631eeh.5.2010.10.28.01.47.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 28 Oct 2010 01:47:26 -0700 (PDT) From: Dmitry Monakhov To: linux-ext4@vger.kernel.org Subject: [PATCH] ext4: do not get s_umount sem on ext4_quota_off User-Agent: Notmuch/0.3.1-90-g8071c5c (http://notmuchmail.org) Emacs/23.1.1 (i486-pc-linux-gnu) Date: Thu, 28 Oct 2010 12:47:19 +0400 Message-ID: <87tyk6ln54.fsf@dmon-lap.sw.ru> MIME-Version: 1.0 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org It must be already acquired by caller. Fix lock_dep complain. Signed-off-by: Dmitry Monakhov Reviewed-by: Jan Kara --- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/ext4/super.c b/fs/ext4/super.c index e59eb37..062d1bc 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4107,12 +4107,10 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id, static int ext4_quota_off(struct super_block *sb, int type) { - /* Force all delayed allocation blocks to be allocated */ - if (test_opt(sb, DELALLOC)) { - down_read(&sb->s_umount); + /* Force all delayed allocation blocks to be allocated. + * Caller already holds s_umount sem */ + if (test_opt(sb, DELALLOC)) sync_filesystem(sb); - up_read(&sb->s_umount); - } return dquot_quota_off(sb, type); }