From: Amir Goldstein Subject: [PATCH 04/12] e2fsprogs: Next3 snapshot control with chattr/lsattr -X Date: Tue, 20 Jul 2010 18:16:05 +0300 Message-ID: <1279638973-14561-5-git-send-email-amir73il@users.sf.net> References: <1279638973-14561-1-git-send-email-amir73il@users.sf.net> Cc: linux-ext4@vger.kernel.org, Amir Goldstein To: tytso@mit.edu, andreas.dilger@oracle.com, jack@suse.cz Return-path: Received: from mail-ey0-f174.google.com ([209.85.215.174]:47120 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932326Ab0GTPR2 (ORCPT ); Tue, 20 Jul 2010 11:17:28 -0400 Received: by eya25 with SMTP id 25so1307759eya.19 for ; Tue, 20 Jul 2010 08:17:26 -0700 (PDT) In-Reply-To: <1279638973-14561-1-git-send-email-amir73il@users.sf.net> Sender: linux-ext4-owner@vger.kernel.org List-ID: Set/clear snapshots parent directory with chattr +/-x. Take/delete snapshot with chattr -X +/-S. Enable/disable snapshot with chattr -X +/-n. View snapshot status with lsattr -X. Signed-off-by: Amir Goldstein --- lib/e2p/e2p.h | 15 +++++++++++++++ lib/e2p/pf.c | 17 ++++++++++++++++- misc/chattr.c | 26 ++++++++++++++++++++++++-- misc/lsattr.c | 9 ++++++--- 4 files changed, 61 insertions(+), 6 deletions(-) diff --git a/lib/e2p/e2p.h b/lib/e2p/e2p.h index 4a68dd9..de6ae54 100644 --- a/lib/e2p/e2p.h +++ b/lib/e2p/e2p.h @@ -26,6 +26,21 @@ /* `options' for print_flags() */ #define PFOPT_LONG 1 /* Must be 1 for compatibility with `int long_format'. */ +#define PFOPT_SNAPSHOT 2 + +/* + * snapshot status/control flags for lsattr/chattr -X. + * using free flags on the GET/SETFLAGS ioctl for snapshot control API. + * TODO: define new ioctls for snapshot status/control. + */ +#define NEXT3_SNAPFILE_LIST_FL 0x00100000 /* snapshot is on list */ +#define NEXT3_SNAPFILE_ACTIVE_FL 0x00200000 /* snapshot is active */ +#define NEXT3_SNAPFILE_OPEN_FL 0x00400000 /* snapshot is mounted */ +#define NEXT3_SNAPFILE_INUSE_FL 0x00800000 /* snapshot is in-use */ +#define NEXT3_SNAPFILE_ENABLED_FL 0x02000000 /* snapshot is enabled */ +#define NEXT3_SNAPFILE_DELETED_FL 0x04000000 /* snapshot is deleted */ +#define NEXT3_SNAPFILE_SHRUNK_FL 0x08000000 /* snapshot is shrunk */ +#define NEXT3_SNAPFILE_TAGGED_FL 0x10000000 /* snapshot is tagged */ int fgetflags (const char * name, unsigned long * flags); diff --git a/lib/e2p/pf.c b/lib/e2p/pf.c index f34a5cc..67a3994 100644 --- a/lib/e2p/pf.c +++ b/lib/e2p/pf.c @@ -48,16 +48,31 @@ static struct flags_name flags_array[] = { { EXT2_TOPDIR_FL, "T", "Top_of_Directory_Hierarchies" }, { EXT4_EXTENTS_FL, "e", "Extents" }, { EXT4_HUGE_FILE_FL, "h", "Huge_file" }, + { EXT4_SNAPFILE_FL, "x", "Snapshot_File" }, + { 0, NULL, NULL } +}; + +static struct flags_name snapshot_flags_array[] = { + { NEXT3_SNAPFILE_LIST_FL, "S", "on_liSt" }, + { NEXT3_SNAPFILE_ENABLED_FL, "n", "eNabled" }, + { NEXT3_SNAPFILE_ACTIVE_FL, "a", "Active" }, + { NEXT3_SNAPFILE_INUSE_FL, "p", "inuse_by_Previous" }, + { NEXT3_SNAPFILE_DELETED_FL, "s", "Deleted" }, + { NEXT3_SNAPFILE_SHRUNK_FL, "h", "sHrunk" }, + { NEXT3_SNAPFILE_OPEN_FL, "o", "mOunted" }, + { NEXT3_SNAPFILE_TAGGED_FL, "t", "Tagged" }, { 0, NULL, NULL } }; void print_flags (FILE * f, unsigned long flags, unsigned options) { + struct flags_name *array = ((options & PFOPT_SNAPSHOT) ? + snapshot_flags_array : flags_array); int long_opt = (options & PFOPT_LONG); struct flags_name *fp; int first = 1; - for (fp = flags_array; fp->flag != 0; fp++) { + for (fp = array; fp->flag != 0; fp++) { if (flags & fp->flag) { if (long_opt) { if (first) diff --git a/misc/chattr.c b/misc/chattr.c index de33b08..dfe9e64 100644 --- a/misc/chattr.c +++ b/misc/chattr.c @@ -82,7 +82,10 @@ static unsigned long sf; static void usage(void) { fprintf(stderr, - _("Usage: %s [-RVf] [-+=AacDdeijsSu] [-v version] files...\n"), + _("Usage: %s [-RVf] [-+=AacDdeijsSux] [-v version] files...\n"), + program_name); + fprintf(stderr, + _("Usage: %s -X [-+=Snapshot] files...\n"), program_name); exit(1); } @@ -92,7 +95,7 @@ struct flags_char { char optchar; }; -static const struct flags_char flags_array[] = { +static const struct flags_char ext2_flags_array[] = { { EXT2_NOATIME_FL, 'A' }, { EXT2_SYNC_FL, 'S' }, { EXT2_DIRSYNC_FL, 'D' }, @@ -106,6 +109,21 @@ static const struct flags_char flags_array[] = { { EXT2_UNRM_FL, 'u' }, { EXT2_NOTAIL_FL, 't' }, { EXT2_TOPDIR_FL, 'T' }, + { EXT4_SNAPFILE_FL, 'x' }, + { 0, 0 } +}; + +static const struct flags_char *flags_array = ext2_flags_array; + +static struct flags_char snapshot_flags_array[] = { + { NEXT3_SNAPFILE_LIST_FL, 'S' }, + { NEXT3_SNAPFILE_ENABLED_FL, 'n' }, + { NEXT3_SNAPFILE_ACTIVE_FL, 'a' }, + { NEXT3_SNAPFILE_INUSE_FL, 'p' }, + { NEXT3_SNAPFILE_DELETED_FL, 's' }, + { NEXT3_SNAPFILE_SHRUNK_FL, 'h' }, + { NEXT3_SNAPFILE_OPEN_FL, 'o' }, + { NEXT3_SNAPFILE_TAGGED_FL, 't' }, { 0, 0 } }; @@ -131,6 +149,10 @@ static int decode_arg (int * i, int argc, char ** argv) { case '-': for (p = &argv[*i][1]; *p; p++) { + if (*p == 'X') { + flags_array = snapshot_flags_array; + continue; + } if (*p == 'R') { recursive = 1; continue; diff --git a/misc/lsattr.c b/misc/lsattr.c index 15b17ad..2864075 100644 --- a/misc/lsattr.c +++ b/misc/lsattr.c @@ -70,7 +70,7 @@ static int generation_opt; static void usage(void) { - fprintf(stderr, _("Usage: %s [-RVadlv] [files...]\n"), program_name); + fprintf(stderr, _("Usage: %s [-XRVadlv] [files...]\n"), program_name); exit(1); } @@ -169,9 +169,12 @@ int main (int argc, char ** argv) #endif if (argc && *argv) program_name = *argv; - while ((c = getopt (argc, argv, "RVadlv")) != EOF) + while ((c = getopt (argc, argv, "XRVadlv")) != EOF) switch (c) { + case 'X': + pf_options |= PFOPT_SNAPSHOT; + break; case 'R': recursive = 1; break; @@ -185,7 +188,7 @@ int main (int argc, char ** argv) dirs_opt = 1; break; case 'l': - pf_options = PFOPT_LONG; + pf_options |= PFOPT_LONG; break; case 'v': generation_opt = 1; -- 1.6.6