From patchwork Mon Apr 18 07:37:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liubo X-Patchwork-Id: 714401 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3I7ZwM5010639 for ; Mon, 18 Apr 2011 07:35:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753304Ab1DRHfy (ORCPT ); Mon, 18 Apr 2011 03:35:54 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:63213 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751246Ab1DRHfy (ORCPT ); Mon, 18 Apr 2011 03:35:54 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 3A055170115; Mon, 18 Apr 2011 15:35:48 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p3I7ZlEh008660; Mon, 18 Apr 2011 15:35:47 +0800 Received: from localhost.localdomain ([10.167.225.27]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011041815361981-83152 ; Mon, 18 Apr 2011 15:36:19 +0800 Message-ID: <4DABEA3A.4070008@cn.fujitsu.com> Date: Mon, 18 Apr 2011 15:37:30 +0800 From: liubo User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1b3pre) Gecko/20090513 Fedora/3.0-2.3.beta2.fc11 Thunderbird/3.0b2 MIME-Version: 1.0 To: ext4 CC: Linux Btrfs , tytso , Chris Mason Subject: [PATCH 2/2] E2fsprogs: add compress and cow support in chattr, lsattr References: <4DA2A15C.1050501@cn.fujitsu.com> <4DA692C8.2080400@cn.fujitsu.com> In-Reply-To: <4DA692C8.2080400@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-18 15:36:19, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-18 15:36:23, Serialize complete at 2011-04-18 15:36:23 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 18 Apr 2011 07:35:58 +0000 (UTC) Modify command 'chattr' and 'lsattr' to support compress and cow. - use 'C' to indicate NOCOW attribute. - still use 'c' to indicate compress attribute. Also update the man doc. Signed-off-by: Liu Bo --- lib/e2p/pf.c | 1 + lib/ext2fs/ext2_fs.h | 1 + misc/chattr.1.in | 15 +++++++++++---- misc/chattr.c | 15 ++++++++++++++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/lib/e2p/pf.c b/lib/e2p/pf.c index cc50896..c9385dd 100644 --- a/lib/e2p/pf.c +++ b/lib/e2p/pf.c @@ -48,6 +48,7 @@ static struct flags_name flags_array[] = { { FS_TOPDIR_FL, "T", "Top_of_Directory_Hierarchies" }, { EXT4_EXTENTS_FL, "e", "Extents" }, { EXT4_HUGE_FILE_FL, "h", "Huge_file" }, + { FS_NOCOW_FL, "C", "NOCOW" }, { 0, NULL, NULL } }; diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h index 858c103..776be92 100644 --- a/lib/ext2fs/ext2_fs.h +++ b/lib/ext2fs/ext2_fs.h @@ -276,6 +276,7 @@ struct ext2_dx_countlimit { #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 FS_NOCOW_FL 0x00800000 /* Do not cow file */ #define EXT4_SNAPFILE_FL 0x01000000 /* Inode is a snapshot */ #define EXT4_SNAPFILE_DELETED_FL 0x04000000 /* Snapshot is being deleted */ #define EXT4_SNAPFILE_SHRUNK_FL 0x08000000 /* Snapshot shrink has completed */ diff --git a/misc/chattr.1.in b/misc/chattr.1.in index 92f6d70..434eb04 100644 --- a/misc/chattr.1.in +++ b/misc/chattr.1.in @@ -19,17 +19,18 @@ chattr \- change file attributes on a Linux file system .B chattr changes the file attributes on a Linux file system. .PP -The format of a symbolic mode is +-=[acdeijstuADST]. +The format of a symbolic mode is +-=[acdeijstuACDST]. .PP The operator `+' causes the selected attributes to be added to the existing attributes of the files; `-' causes them to be removed; and `=' causes them to be the only attributes that the files have. .PP -The letters `acdeijstuADST' select the new attributes for the files: +The letters `acdeijstuACDST' select the new attributes for the files: append only (a), compressed (c), no dump (d), extent format (e), immutable (i), data journalling (j), secure deletion (s), no tail-merging (t), -undeletable (u), no atime updates (A), synchronous directory updates (D), -synchronous updates (S), and top of directory hierarchy (T). +undeletable (u), no atime updates (A), no copy on write (C), +synchronous directory updates (D), synchronous updates (S), +and top of directory hierarchy (T). .PP The following attributes are read-only, and may be listed by .BR lsattr (1) @@ -64,6 +65,10 @@ this file compresses data before storing them on the disk. Note: please make sure to read the bugs and limitations section at the end of this document. .PP +A file with the `C' attribute set is marked without COW (copy on write). Note: +please make sure to read the bugs and limitations section at the end of this +document. +.PP When a directory with the `D' attribute set is modified, the changes are written synchronously on the disk; this is equivalent to the `dirsync' mount option applied to a subset of the files. @@ -161,6 +166,8 @@ The `c', 's', and `u' attributes are not honored by the ext2 and ext3 filesystems as implemented in the current mainline Linux kernels. These attributes may be implemented in future versions of the ext2 and ext3 filesystems. +The `C' attribute is only used in btrfs filesystem in the current mainline +Linux kernels. .PP The `j' option is only useful if the filesystem is mounted as ext3. .PP diff --git a/misc/chattr.c b/misc/chattr.c index 78e3736..8c8231e 100644 --- a/misc/chattr.c +++ b/misc/chattr.c @@ -82,7 +82,7 @@ static unsigned long sf; static void usage(void) { fprintf(stderr, - _("Usage: %s [-RVf] [-+=AacDdeijsSu] [-v version] files...\n"), + _("Usage: %s [-RVf] [-+=AacDdeijsSuC] [-v version] files...\n"), program_name); exit(1); } @@ -106,6 +106,7 @@ static const struct flags_char flags_array[] = { { FS_UNRM_FL, 'u' }, { FS_NOTAIL_FL, 't' }, { FS_TOPDIR_FL, 'T' }, + { FS_NOCOW_FL, 'C' }, { 0, 0 } }; @@ -159,6 +160,12 @@ static int decode_arg (int * i, int argc, char ** argv) } if ((fl = get_flag(*p)) == 0) usage(); + + if (fl == FS_COMPR_FL) { + af |= FS_NOCOMPR_FL; + add = 1; + } + rf |= fl; rem = 1; } @@ -168,6 +175,12 @@ static int decode_arg (int * i, int argc, char ** argv) for (p = &argv[*i][1]; *p; p++) { if ((fl = get_flag(*p)) == 0) usage(); + + if (fl == FS_COMPR_FL) { + rf |= FS_NOCOMPR_FL; + rem = 1; + } + af |= fl; } break;