From patchwork Sun Oct 10 12:36:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 67351 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 AA8C8B6F06 for ; Sun, 10 Oct 2010 23:37:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757441Ab0JJMhM (ORCPT ); Sun, 10 Oct 2010 08:37:12 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:56838 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754429Ab0JJMhL (ORCPT ); Sun, 10 Oct 2010 08:37:11 -0400 Received: by pzk34 with SMTP id 34so772899pzk.19 for ; Sun, 10 Oct 2010 05:37:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=1jHvH3F46WnuZAOqdz5rzrkEiqJJFspU4sBLr9wJhkg=; b=EkNAzwsedykFQCemNgYpiIkRG7IU9FtjTO3kgmBycF72SpVLtrT2Bf8sVsvEJ1684x 5nBNR0Y8oqDfkIxCyHs5CKbBmqZApf6nZM+dMFVzzdMgZum2XC36pPHZgmfqOtUbanHi K0xKlgdr+1RzMP8G6nMuaHkUfWg0K36J3/LUs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=m1s4vtZeJLa1m6+LkD9XzBqXgU85Ea610PRyXZdPupmv0ZQylZXBZWb8vN14uC0Ohz /eKFOVTbLkLZE7aWug0ZZCjGafNLlAg57fkchBVHfVrpmgBR5gtEdTc7U+ggcJyq9XU9 Gpam/gdri4reaFYeVUqpv8Tk96SDSIUm6t1PY= Received: by 10.142.188.1 with SMTP id l1mr4162298wff.60.1286714227144; Sun, 10 Oct 2010 05:37:07 -0700 (PDT) Received: from localhost.localdomain ([211.201.181.190]) by mx.google.com with ESMTPS id q13sm6681222wfc.17.2010.10.10.05.37.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 10 Oct 2010 05:37:05 -0700 (PDT) From: Namhyung Kim To: Jan Kara , Andrew Morton , Andreas Dilger Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ext3: Cleanup ext3_setup_super() Date: Sun, 10 Oct 2010 21:36:59 +0900 Message-Id: <1286714219-3183-1-git-send-email-namhyung@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Fix mount-count check to emit warning only if s_max_mnt_count is greater than 0 according to man tune2fs(8). Also removes unnecessary casts. Signed-off-by: Namhyung Kim --- If this looks fine, I'll send the same patches for ext2 and ext4. Thanks. fs/ext3/super.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 5dbf4db..4caeffa 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -1306,9 +1306,9 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es, ext3_msg(sb, KERN_WARNING, "warning: mounting fs with errors, " "running e2fsck is recommended"); - else if ((__s16) le16_to_cpu(es->s_max_mnt_count) >= 0 && + else if ((__s16) le16_to_cpu(es->s_max_mnt_count) > 0 && le16_to_cpu(es->s_mnt_count) >= - (unsigned short) (__s16) le16_to_cpu(es->s_max_mnt_count)) + le16_to_cpu(es->s_max_mnt_count)) ext3_msg(sb, KERN_WARNING, "warning: maximal mount count reached, " "running e2fsck is recommended"); @@ -1325,7 +1325,7 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es, valid forever! :) */ es->s_state &= cpu_to_le16(~EXT3_VALID_FS); #endif - if (!(__s16) le16_to_cpu(es->s_max_mnt_count)) + if (!le16_to_cpu(es->s_max_mnt_count)) es->s_max_mnt_count = cpu_to_le16(EXT3_DFL_MAX_MNT_COUNT); le16_add_cpu(&es->s_mnt_count, 1); es->s_mtime = cpu_to_le32(get_seconds());