From patchwork Fri Dec 14 07:50:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Blagodarenko X-Patchwork-Id: 1013370 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ejd1m4OO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43GN692qpVz9sBZ for ; Fri, 14 Dec 2018 18:51:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726654AbeLNHv2 (ORCPT ); Fri, 14 Dec 2018 02:51:28 -0500 Received: from mail-it1-f195.google.com ([209.85.166.195]:33771 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726533AbeLNHv2 (ORCPT ); Fri, 14 Dec 2018 02:51:28 -0500 Received: by mail-it1-f195.google.com with SMTP id m8so18339281itk.0 for ; Thu, 13 Dec 2018 23:51:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Sqz4bx9y7/Zhj3nGBniPKBgGWHskaw8uZZREWzOHpLs=; b=Ejd1m4OOijQj0+YvidmdMRqfpuq8Dohxn1vuVxBer8MNHSnosMHvh0wHlcbeTWLYwN paH2Xy3gp8MDP0o00kXfqTkHE9MQOgZ1hk+K1jcfsEwag8B6dJmfcv6dInp4s2vaH8A9 7gZ1ozjVTvoyU+qd1Y11ILrCEJSuBu/DEzGXHXfmiwyiHq4VMkWfE82J7uTRhHrDQQze 21/Y2mHyCUlO/MPdiLIzxPa2XMQXLnI76HXFc6qpe/Xj4WT/0nbODfmx6R5bc+djYoOe ShiA9uf3G35NGHXTvbK2VWBdfnFSBTwDC0jQ4AfjQrdKVLhd3eHDGsEf0pjcxDlUFGJA 1ytw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Sqz4bx9y7/Zhj3nGBniPKBgGWHskaw8uZZREWzOHpLs=; b=tSS0kn/QxRVYnVbW8Vu1krgZJiZt9I3SpGSp/CH7MtEoj+8N1Lq2FUKSFUpUzJkN1S /kZP+LT4QQOlYEf0DyjXKuLcHZLGQ2JYMBnKL4IHgfQWly43Zug2tGYyd5RjFD/kgxWA Id2rBDnRXPAjENX42kIE//g8q0qq4YtF51EGAGz4BIOSx9jDhfHwiJYm+C3fanE6JW++ D3fozqPNisjCz3d1jInXRneINuHJxoJ4o0guPlcJenM8lZctfiMZ553IRkUfqUDpMgt9 07Vq6pcBKm8OQ13G+q0Mgnaikce9PVgtrD6dINeedWKyTAoqQ3IHDjkja8K1plUSQPCN HRMA== X-Gm-Message-State: AA+aEWab9oenJe3Al8up8iARn2Ev1XlRd91FI7jJbDxAalBc4mKdwU9N K9+oZRg9G8K3JojhOWSE02xlh+PgXW8= X-Google-Smtp-Source: AFSGD/UYep0wUty4GuCr89PhYIUGQo4L4HWhD6nRqHLBLgST7F41ZW5zpCofnq6aLU7cbB/IdXZvPg== X-Received: by 2002:a24:22c6:: with SMTP id o189mr646274ito.86.1544773887279; Thu, 13 Dec 2018 23:51:27 -0800 (PST) Received: from C02TN4C6HTD6.us.cray.com (seattle-nat.cray.com. [136.162.66.1]) by smtp.gmail.com with ESMTPSA id i21sm1913928ioo.59.2018.12.13.23.51.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 23:51:26 -0800 (PST) From: Artem Blagodarenko To: linux-ext4@vger.kernel.org Cc: adilger.kernel@dilger.ca Subject: [PATCH v2 1/2] e2fsck: allow to check >2GB sized directory Date: Fri, 14 Dec 2018 10:50:53 +0300 Message-Id: <20181214075054.47359-1-artem.blagodarenko@gmail.com> X-Mailer: git-send-email 2.14.3 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org After large_dir feature has been added, e2fsprogs is ready for directories > 2GB, so we can remove e2fsck directory size check. Signed-off-by: Artem Blagodarenko Reviewed-by: Andreas Dilger --- e2fsck/pass1.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 5c0b92d5..5c413610 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -3647,9 +3647,12 @@ static int process_block(ext2_filsys fs, } } - if (p->is_dir && blockcnt > (1 << (21 - fs->super->s_log_block_size))) + if (p->is_dir && !ext2fs_has_feature_largedir(fs->super) && + blockcnt > (1 << (21 - fs->super->s_log_block_size))) problem = PR_1_TOOBIG_DIR; - if (p->is_reg && p->num_blocks+1 >= p->max_blocks) + if (p->is_dir && p->num_blocks + 1 >= p->max_blocks) + problem = PR_1_TOOBIG_DIR; + if (p->is_reg && p->num_blocks + 1 >= p->max_blocks) problem = PR_1_TOOBIG_REG; if (!p->is_dir && !p->is_reg && blockcnt > 0) problem = PR_1_TOOBIG_SYMLINK;