From patchwork Tue Jul 28 05:33:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 1337533 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BG5BB2LFbz9sRN for ; Tue, 28 Jul 2020 15:40:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726802AbgG1Fks (ORCPT ); Tue, 28 Jul 2020 01:40:48 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:1847 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726245AbgG1Fks (ORCPT ); Tue, 28 Jul 2020 01:40:48 -0400 X-IronPort-AV: E=Sophos;i="5.75,405,1589212800"; d="scan'208";a="96975613" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Jul 2020 13:40:45 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id D318E4CE2808; Tue, 28 Jul 2020 13:40:39 +0800 (CST) Received: from G08CNEXCHPEKD05.g08.fujitsu.local (10.167.33.203) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 28 Jul 2020 13:40:39 +0800 Received: from Fedora-30.g08.fujitsu.local (10.167.220.106) by G08CNEXCHPEKD05.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 28 Jul 2020 13:40:38 +0800 From: Xiao Yang To: , , , CC: , Xiao Yang Subject: [PATCH v2] chattr/lsattr: Support dax attribute Date: Tue, 28 Jul 2020 13:33:21 +0800 Message-ID: <20200728053321.12892-1-yangx.jy@cn.fujitsu.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-yoursite-MailScanner-ID: D318E4CE2808.AC488 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@cn.fujitsu.com X-Spam-Status: No Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Use the letter 'x' to set/get dax attribute on a directory/file. Signed-off-by: Xiao Yang Reviewed-by: Andreas Dilger --- V1->V2: 1) Define FS_DAX_FL in order and add missing 'x' letter in manpage. 2) Add more detailed description about 'x' attribute. 3) 'x' is a separate attribute and doesn't always affect S_DAX(i.e. pagecache bypass) so remove the related info. lib/e2p/pf.c | 1 + lib/ext2fs/ext2_fs.h | 1 + misc/chattr.1.in | 15 ++++++++++++--- misc/chattr.c | 3 ++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/e2p/pf.c b/lib/e2p/pf.c index 0c6998c4..e59cccff 100644 --- a/lib/e2p/pf.c +++ b/lib/e2p/pf.c @@ -44,6 +44,7 @@ static struct flags_name flags_array[] = { { EXT2_TOPDIR_FL, "T", "Top_of_Directory_Hierarchies" }, { EXT4_EXTENTS_FL, "e", "Extents" }, { FS_NOCOW_FL, "C", "No_COW" }, + { FS_DAX_FL, "x", "Dax" }, { EXT4_CASEFOLD_FL, "F", "Casefold" }, { EXT4_INLINE_DATA_FL, "N", "Inline_Data" }, { EXT4_PROJINHERIT_FL, "P", "Project_Hierarchy" }, diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h index 6c20ea77..88f510a3 100644 --- a/lib/ext2fs/ext2_fs.h +++ b/lib/ext2fs/ext2_fs.h @@ -335,6 +335,7 @@ struct ext2_dx_tail { /* EXT4_EOFBLOCKS_FL 0x00400000 was here */ #define FS_NOCOW_FL 0x00800000 /* Do not cow file */ #define EXT4_SNAPFILE_FL 0x01000000 /* Inode is a snapshot */ +#define FS_DAX_FL 0x02000000 /* Inode is DAX */ #define EXT4_SNAPFILE_DELETED_FL 0x04000000 /* Snapshot is being deleted */ #define EXT4_SNAPFILE_SHRUNK_FL 0x08000000 /* Snapshot shrink has completed */ #define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data */ diff --git a/misc/chattr.1.in b/misc/chattr.1.in index ff2fcf00..5a4928a5 100644 --- a/misc/chattr.1.in +++ b/misc/chattr.1.in @@ -23,13 +23,13 @@ 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 +-=[aAcCdDeFijPsStTu]. +The format of a symbolic mode is +-=[aAcCdDeFijPsStTux]. .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 'aAcCdDeFijPsStTu' select the new attributes for the files: +The letters 'aAcCdDeFijPsStTux' select the new attributes for the files: append only (a), no atime updates (A), compressed (c), @@ -45,7 +45,8 @@ secure deletion (s), synchronous updates (S), no tail-merging (t), top of directory hierarchy (T), -and undeletable (u). +undeletable (u), +and direct access for files (x). .PP The following attributes are read-only, and may be listed by .BR lsattr (1) @@ -210,6 +211,14 @@ saved. This allows the user to ask for its undeletion. Note: please make sure to read the bugs and limitations section at the end of this document. .TP +.B x +The 'x' attribute can be set on a directory or file. If the attribute +is set on an existing directory, it will be inherited by all files and +subdirectories that are subsequently created in the directory. If an +existing directory has contained some files and subdirectories, modifying +the attribute on the parent directory doesn't change the attributes on +these files and subdirectories. +.TP .B V A file with the 'V' attribute set has fs-verity enabled. It cannot be written to, and the filesystem will automatically verify all data read diff --git a/misc/chattr.c b/misc/chattr.c index a5d60170..c0337f86 100644 --- a/misc/chattr.c +++ b/misc/chattr.c @@ -86,7 +86,7 @@ static unsigned long sf; static void usage(void) { fprintf(stderr, - _("Usage: %s [-pRVf] [-+=aAcCdDeijPsStTuF] [-v version] files...\n"), + _("Usage: %s [-pRVf] [-+=aAcCdDeijPsStTuFx] [-v version] files...\n"), program_name); exit(1); } @@ -112,6 +112,7 @@ static const struct flags_char flags_array[] = { { EXT2_NOTAIL_FL, 't' }, { EXT2_TOPDIR_FL, 'T' }, { FS_NOCOW_FL, 'C' }, + { FS_DAX_FL, 'x' }, { EXT4_CASEFOLD_FL, 'F' }, { 0, 0 } };