linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: tytso@mit.edu, darrick.wong@oracle.com
Cc: linux-ext4@vger.kernel.org
Subject: [PATCH 21/25] misc: use the checksum predicate function, not raw flag tests
Date: Thu, 17 Oct 2013 21:51:16 -0700	[thread overview]
Message-ID: <20131018045116.7339.26187.stgit@birch.djwong.org> (raw)
In-Reply-To: <20131018044854.7339.48457.stgit@birch.djwong.org>

metadata_csum implies uninit_bg, and in fact forces the bit off for
rocompat with older implementations.  Therefore, to detect the
presence of checksums, we should use the predicate function to decide
if group descriptor checksums are turned on, not open-coded flag
tests.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 misc/e2image.c     |    4 +---
 resize/resize2fs.c |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)


diff --git a/misc/e2image.c b/misc/e2image.c
index 4a5bb22..a466fe8 100644
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -349,9 +349,7 @@ static void mark_table_blocks(ext2_filsys fs)
 		    ext2fs_inode_table_loc(fs, i)) {
 			unsigned int end = (unsigned) fs->inode_blocks_per_group;
 			/* skip unused blocks */
-			if (!output_is_blk &&
-			    EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
-						       EXT4_FEATURE_RO_COMPAT_GDT_CSUM))
+			if (!output_is_blk && ext2fs_has_group_desc_csum(fs))
 				end -= (ext2fs_bg_itable_unused(fs, i) /
 					EXT2_INODES_PER_BLOCK(fs->super));
 			for (j = 0, b = ext2fs_inode_table_loc(fs, i);
diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index b351cc6..440c20e 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -1012,9 +1012,7 @@ static errcode_t adjust_superblock(ext2_resize_t rfs, blk64_t new_size)
 	 * supports lazy inode initialization, we can skip
 	 * initializing the inode table.
 	 */
-	if (lazy_itable_init &&
-	    EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
-				       EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
+	if (lazy_itable_init && ext2fs_has_group_desc_csum(fs)) {
 		retval = 0;
 		goto errout;
 	}


  parent reply	other threads:[~2013-10-18  4:51 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-18  4:48 [PATCH v2 00/25] e2fsprogs patchbomb 10/2013 Darrick J. Wong
2013-10-18  4:49 ` [PATCH 01/25] libext2fs: stop iterating dirents when done linking Darrick J. Wong
2013-10-23 23:39   ` Theodore Ts'o
2013-10-18  4:49 ` [PATCH 02/25] libext2fs: fix ext2fs_open2() truncation of the superblock parameter Darrick J. Wong
2013-10-18 18:32   ` Darrick J. Wong
2013-10-23 14:49     ` Lukáš Czerner
2013-10-18  4:49 ` [PATCH 03/25] mke2fs: don't let resize= turn on resize_inode when meta_bg is set Darrick J. Wong
2013-10-23 15:08   ` Lukáš Czerner
2013-10-23 23:40   ` Theodore Ts'o
2013-10-18  4:49 ` [PATCH 04/25] libext2fs: reject 64bit badblocks numbers Darrick J. Wong
2013-10-23 15:24   ` Lukáš Czerner
2013-10-23 23:58     ` Theodore Ts'o
2013-10-24 11:40       ` Lukáš Czerner
2013-10-18  4:49 ` [PATCH 05/25] libext2fs: don't overflow when punching indirect blocks with large blocks Darrick J. Wong
2013-10-24  0:08   ` Theodore Ts'o
2013-12-04  4:40     ` Darrick J. Wong
2013-10-18  4:49 ` [PATCH 06/25] libext2fs: fix tests that set LARGE_FILE Darrick J. Wong
2013-11-25  7:09   ` Zheng Liu
2013-11-25 17:57     ` Darrick J. Wong
2013-10-18  4:49 ` [PATCH 07/25] mke2fs: load configfile blocksize setting before 64bit checks Darrick J. Wong
2013-11-25  8:01   ` Zheng Liu
2013-10-18  4:49 ` [PATCH 08/25] debugfs: fix various minor bogosity Darrick J. Wong
2013-11-25  8:08   ` Zheng Liu
2013-11-25 18:05     ` Darrick J. Wong
2013-10-18  4:49 ` [PATCH 09/25] e2fsck: teach EA refcounting code to handle 64bit block addresses Darrick J. Wong
2013-10-18 18:37   ` Darrick J. Wong
2013-11-25  8:18     ` Zheng Liu
2013-10-18  4:50 ` [PATCH 10/25] debugfs: handle 64bit block numbers Darrick J. Wong
2013-10-18 18:47   ` Darrick J. Wong
2013-11-25  8:33   ` Zheng Liu
2013-11-25 17:49     ` Darrick J. Wong
2013-10-18  4:50 ` [PATCH 11/25] libext2fs: only punch complete clusters Darrick J. Wong
2013-10-18 18:55   ` Darrick J. Wong
2013-11-25  8:51   ` Zheng Liu
2013-10-18  4:50 ` [PATCH 12/25] libext2fs: don't update the summary counts when doing implied cluster allocation Darrick J. Wong
2013-11-25  9:03   ` Zheng Liu
2013-10-18  4:50 ` [PATCH 13/25] libext2fs: use ext2fs_punch() to truncate quota file Darrick J. Wong
2013-11-25  9:08   ` Zheng Liu
2013-10-18  4:50 ` [PATCH 14/25] e2fsck: only release clusters when shortening a directory during a rehash Darrick J. Wong
2013-11-25 11:09   ` Zheng Liu
2013-10-18  4:50 ` [PATCH 15/25] e2fsck: print cluster ranges when encountering bitmap errors Darrick J. Wong
2013-11-25 11:56   ` Zheng Liu
2013-10-18  4:50 ` [PATCH 16/25] resize2fs: convert fs to and from 64bit mode Darrick J. Wong
2013-10-18 18:59   ` Darrick J. Wong
2013-11-26  6:44   ` Zheng Liu
2013-11-26 18:39     ` Darrick J. Wong
2013-11-27  2:21       ` Zheng Liu
2013-10-18  4:50 ` [PATCH 17/25] resize2fs: when toggling 64bit, don't free in-use bg data clusters Darrick J. Wong
2013-10-18  4:50 ` [PATCH 18/25] resize2fs: adjust reserved_gdt_blocks when changing group descriptor size Darrick J. Wong
2013-10-18  4:51 ` [PATCH 19/25] resize2fs: during shrink, don't free in-use bg data clusters Darrick J. Wong
2013-10-18  4:51 ` [PATCH 20/25] resize2fs: don't free in-use clusters when moving blocks Darrick J. Wong
2013-10-18  4:51 ` Darrick J. Wong [this message]
2013-10-18  4:51 ` [PATCH 22/25] resize2fs: rewrite extent/dir/ea block checksums when migrating Darrick J. Wong
2013-10-18  4:51 ` [PATCH 23/25] libext2fs: support modifying arbitrary extended attributes Darrick J. Wong
2013-10-18 19:25   ` Darrick J. Wong
2013-10-22  1:13   ` Darrick J. Wong
2013-11-26  7:21   ` Zheng Liu
2013-11-26 19:55     ` Darrick J. Wong
2013-11-27  2:52       ` Zheng Liu
2013-11-27  3:13         ` Darrick J. Wong
2013-11-27 11:36           ` Zheng Liu
2013-11-27  1:56     ` Darrick J. Wong
2013-11-29  5:30       ` Zheng Liu
2013-11-29  8:17         ` Jan Kara
2013-11-30 20:24           ` Darrick J. Wong
2013-12-02  8:38             ` Jan Kara
2013-10-18  4:51 ` [PATCH 24/25] misc: add fuse2fs, a FUSE server for e2fsprogs Darrick J. Wong
2013-10-18 19:36   ` Darrick J. Wong
2013-10-22  1:20   ` Darrick J. Wong
2013-10-18 13:13 ` [PATCH v2 00/25] e2fsprogs patchbomb 10/2013 Lukáš Czerner
2013-10-18 18:13   ` Darrick J. Wong
2013-10-18 20:37     ` Darrick J. Wong
2013-10-18 18:39 ` Theodore Ts'o

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131018045116.7339.26187.stgit@birch.djwong.org \
    --to=darrick.wong@oracle.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).