From patchwork Thu Apr 9 15:14:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Xi X-Patchwork-Id: 6188551 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7C45FBF4A6 for ; Thu, 9 Apr 2015 15:16:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 29B7D2037A for ; Thu, 9 Apr 2015 15:16:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEA002035C for ; Thu, 9 Apr 2015 15:16:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754192AbbDIPQS (ORCPT ); Thu, 9 Apr 2015 11:16:18 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:33470 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755502AbbDIPPK (ORCPT ); Thu, 9 Apr 2015 11:15:10 -0400 Received: by pdbnk13 with SMTP id nk13so156202155pdb.0; Thu, 09 Apr 2015 08:15:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=nei1OzaV6c9veNXVOlFX/jcFP0+nb/bd/QO1L6fEXxs=; b=TwxwYoc/ELMmFHyj7iXalnEdfQlZ5aPmaXRwhW1M+eB2IJ3QE91Bd77xwIAfV+cel0 376p/7I80r+MTsjkq+XW2I4kT8m11n8V5YE0N/9udeG1nu8W7yFTK8wjzJHCKfcUiCCF RoBIcbdgZdPouaaa+MH6gMqTEXZUhhmZVEpkVNnS1gbsTUfYyojb7vpM8TcDM5yklKnD Ut0M7PbLjVV4clzydktyWwrBFQe6EoHD3zbsXeK2sblJvxr7Yn337GWChlbGbE/KeoGY ABaKmqehoPrrMDEKcIp+I7IaZtJEG4iu4AfbrM+iSDqUJ68m7kFElgqwPeIfQR/PbUUp 7WMA== X-Received: by 10.67.5.230 with SMTP id cp6mr56106875pad.55.1428592509781; Thu, 09 Apr 2015 08:15:09 -0700 (PDT) Received: from localhost.localdomain (ddnj-fw01.datadirectnet.jp. [180.42.29.249]) by mx.google.com with ESMTPSA id nm1sm14634822pbc.50.2015.04.09.08.15.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2015 08:15:09 -0700 (PDT) From: Li Xi X-Google-Original-From: Li Xi To: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-api@vger.kernel.org, tytso@mit.edu, adilger@dilger.ca, jack@suse.cz, viro@zeniv.linux.org.uk, hch@infradead.org, dmonakhov@openvz.org Subject: [v12 5/5] ext4: cleanup inode flag definitions Date: Fri, 10 Apr 2015 00:14:37 +0900 Message-Id: <1428592477-8212-6-git-send-email-lixi@ddn.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1428592477-8212-1-git-send-email-lixi@ddn.com> References: <1428592477-8212-1-git-send-email-lixi@ddn.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The inode flags defined in uapi/linux/fs.h were migrated from ext4.h. This patch changes the inode flag definitions in ext4.h to VFS definitions to make the gaps between them clearer. Signed-off-by: Li Xi Reviewed-by: Andreas Dilger --- fs/ext4/ext4.h | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 377fec0..05d0e8d 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -352,34 +352,34 @@ struct flex_groups { /* * Inode flags */ -#define EXT4_SECRM_FL 0x00000001 /* Secure deletion */ -#define EXT4_UNRM_FL 0x00000002 /* Undelete */ -#define EXT4_COMPR_FL 0x00000004 /* Compress file */ -#define EXT4_SYNC_FL 0x00000008 /* Synchronous updates */ -#define EXT4_IMMUTABLE_FL 0x00000010 /* Immutable file */ -#define EXT4_APPEND_FL 0x00000020 /* writes to file may only append */ -#define EXT4_NODUMP_FL 0x00000040 /* do not dump file */ -#define EXT4_NOATIME_FL 0x00000080 /* do not update atime */ +#define EXT4_SECRM_FL FS_SECRM_FL /* Secure deletion */ +#define EXT4_UNRM_FL FS_UNRM_FL /* Undelete */ +#define EXT4_COMPR_FL FS_COMPR_FL /* Compress file */ +#define EXT4_SYNC_FL FS_SYNC_FL /* Synchronous updates */ +#define EXT4_IMMUTABLE_FL FS_IMMUTABLE_FL /* Immutable file */ +#define EXT4_APPEND_FL FS_APPEND_FL /* writes to file may only append */ +#define EXT4_NODUMP_FL FS_NODUMP_FL /* do not dump file */ +#define EXT4_NOATIME_FL FS_NOATIME_FL /* do not update atime */ /* Reserved for compression usage... */ -#define EXT4_DIRTY_FL 0x00000100 -#define EXT4_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */ -#define EXT4_NOCOMPR_FL 0x00000400 /* Don't compress */ +#define EXT4_DIRTY_FL FS_DIRTY_FL +#define EXT4_COMPRBLK_FL FS_COMPRBLK_FL /* One or more compressed clusters */ +#define EXT4_NOCOMPR_FL FS_NOCOMP_FL /* Don't compress */ /* nb: was previously EXT2_ECOMPR_FL */ -#define EXT4_ENCRYPT_FL 0x00000800 /* encrypted file */ +#define EXT4_ENCRYPT_FL 0x00000800 /* encrypted file */ /* End compression flags --- maybe not all used */ -#define EXT4_INDEX_FL 0x00001000 /* hash-indexed directory */ -#define EXT4_IMAGIC_FL 0x00002000 /* AFS directory */ -#define EXT4_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */ -#define EXT4_NOTAIL_FL 0x00008000 /* file tail should not be merged */ -#define EXT4_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */ -#define EXT4_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ -#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */ -#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ -#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ -#define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */ -#define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */ -#define EXT4_PROJINHERIT_FL 0x20000000 /* Create with parents projid */ -#define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */ +#define EXT4_INDEX_FL FS_INDEX_FL /* hash-indexed directory */ +#define EXT4_IMAGIC_FL FS_IMAGIC_FL /* AFS directory */ +#define EXT4_JOURNAL_DATA_FL FS_JOURNAL_DATA_FL /* file data should be journaled */ +#define EXT4_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */ +#define EXT4_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */ +#define EXT4_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ +#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */ +#define EXT4_EXTENTS_FL FS_EXTENT_FL /* Inode uses extents */ +#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ +#define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */ +#define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */ +#define EXT4_PROJINHERIT_FL FS_PROJINHERIT_FL /* Create with parents projid */ +#define EXT4_RESERVED_FL FS_RESERVED_FL /* reserved for ext4 lib */ #define EXT4_FL_USER_VISIBLE 0x204BDFFF /* User visible flags */ #define EXT4_FL_USER_MODIFIABLE 0x204380FF /* User modifiable flags */