From patchwork Fri Apr 8 07:53:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kazuya Mio X-Patchwork-Id: 90292 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 3F808B6F83 for ; Fri, 8 Apr 2011 18:08:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932099Ab1DHIIl (ORCPT ); Fri, 8 Apr 2011 04:08:41 -0400 Received: from TYO201.gate.nec.co.jp ([202.32.8.193]:39269 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932194Ab1DHIIk (ORCPT ); Fri, 8 Apr 2011 04:08:40 -0400 Received: from mailgate3.nec.co.jp ([10.7.69.192]) by tyo201.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id p3888bcW000423; Fri, 8 Apr 2011 17:08:37 +0900 (JST) Received: (from root@localhost) by mailgate3.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) id p3888bn01504; Fri, 8 Apr 2011 17:08:37 +0900 (JST) Received: from mail03.kamome.nec.co.jp (mail03.kamome.nec.co.jp [10.25.43.7]) by mailsv.nec.co.jp (8.13.8/8.13.4) with ESMTP id p3888aTM009456; Fri, 8 Apr 2011 17:08:37 +0900 (JST) Received: from shoin.jp.nec.com ([10.26.220.3] [10.26.220.3]) by mail02.kamome.nec.co.jp with ESMTP id BT-MMP-298196; Fri, 8 Apr 2011 16:53:14 +0900 Received: from [10.64.168.30] ([10.64.168.30] [10.64.168.30]) by mail.jp.nec.com with ESMTP; Fri, 8 Apr 2011 16:53:13 +0900 Message-ID: <4D9EBEE3.8010405@sx.jp.nec.com> Date: Fri, 08 Apr 2011 16:53:07 +0900 From: Kazuya Mio User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; ja; rv:1.9.2.15) Gecko/20110303 Thunderbird/3.1.9 MIME-Version: 1.0 To: ext4 , Theodore Tso Subject: [PATCH 09/11] e4defrag: Use EXT2_SUPER_MAGIC instead of EXT4_SUPER_MAGIC Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org e2fsprogs has EXT2_SUPER_MAGIC defined for the magic number of ext4 filesystem. e4defrag uses it instead of EXT4_SUPER_MAGIC. Signed-off-by: Kazuya Mio --- misc/e4defrag.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 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/misc/e4defrag.c b/misc/e4defrag.c index 6365103..b87aae9 100644 --- a/misc/e4defrag.c +++ b/misc/e4defrag.c @@ -91,9 +91,6 @@ #define FS_EXT4 "ext4" #define ROOT_UID 0 -/* Magic number for ext4 */ -#define EXT4_SUPER_MAGIC 0xEF53 - /* The following macro is used for ioctl FS_IOC_FIEMAP * EXTENT_MAX_COUNT: the maximum number of extents for exchanging between * kernel-space and user-space per ioctl @@ -293,7 +290,7 @@ static int is_ext4(const char *file) return -1; } - if (fsbuf.f_type != EXT4_SUPER_MAGIC) { + if (fsbuf.f_type != EXT2_SUPER_MAGIC) { PRINT_ERR_MSG(NGMSG_EXT4); return -1; }