From ca9d1a5cd63b0dbf4cd1923a4d912fdba950020b Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Mon, 6 Apr 2009 19:01:41 -0700 Subject: [PATCH] --- yaml --- r: 142623 b: refs/heads/master c: 0c4fb877641c5c72d4a3ce8921a256bfe44055c0 h: refs/heads/master i: 142621: 47ceec2ea8711b394b1b7996f587f9e07f6c9006 142619: 6112e6a033827b06aaa5767729717755442cbd7d 142615: 11eb2280bfe194460b8b59ef59d7d2a0866bc34e 142607: 5126ca0568cd4132fe6336b738646ac41b11bac3 142591: 9e5975a3284a2c2c5c5dcfa885e3c8f70b808d2b v: v3 --- [refs] | 2 +- trunk/fs/Kconfig | 27 ++++++++++++++++++++++++++- trunk/fs/Makefile | 1 + trunk/fs/nilfs2/Makefile | 5 +++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 trunk/fs/nilfs2/Makefile diff --git a/[refs] b/[refs] index 5f077b057587..135c7785860d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7942b919f7321f95a777d396ff7894a7a83dc9b0 +refs/heads/master: 0c4fb877641c5c72d4a3ce8921a256bfe44055c0 diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig index 86b203fc3c56..9f7270f36b2a 100644 --- a/trunk/fs/Kconfig +++ b/trunk/fs/Kconfig @@ -175,9 +175,34 @@ source "fs/qnx4/Kconfig" source "fs/romfs/Kconfig" source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" - source "fs/exofs/Kconfig" +config NILFS2_FS + tristate "NILFS2 file system support (EXPERIMENTAL)" + depends on BLOCK && EXPERIMENTAL + select CRC32 + help + NILFS2 is a log-structured file system (LFS) supporting continuous + snapshotting. In addition to versioning capability of the entire + file system, users can even restore files mistakenly overwritten or + destroyed just a few seconds ago. Since this file system can keep + consistency like conventional LFS, it achieves quick recovery after + system crashes. + + NILFS2 creates a number of checkpoints every few seconds or per + synchronous write basis (unless there is no change). Users can + select significant versions among continuously created checkpoints, + and can change them into snapshots which will be preserved for long + periods until they are changed back to checkpoints. Each + snapshot is mountable as a read-only file system concurrently with + its writable mount, and this feature is convenient for online backup. + + Some features including atime, extended attributes, and POSIX ACLs, + are not supported yet. + + To compile this file system support as a module, choose M here: the + module will be called nilfs2. If unsure, say N. + endif # MISC_FILESYSTEMS menuconfig NETWORK_FILESYSTEMS diff --git a/trunk/fs/Makefile b/trunk/fs/Makefile index 70b2aed87133..af6d04700d9c 100644 --- a/trunk/fs/Makefile +++ b/trunk/fs/Makefile @@ -114,6 +114,7 @@ obj-$(CONFIG_JFS_FS) += jfs/ obj-$(CONFIG_XFS_FS) += xfs/ obj-$(CONFIG_9P_FS) += 9p/ obj-$(CONFIG_AFS_FS) += afs/ +obj-$(CONFIG_NILFS2_FS) += nilfs2/ obj-$(CONFIG_BEFS_FS) += befs/ obj-$(CONFIG_HOSTFS) += hostfs/ obj-$(CONFIG_HPPFS) += hppfs/ diff --git a/trunk/fs/nilfs2/Makefile b/trunk/fs/nilfs2/Makefile new file mode 100644 index 000000000000..df3e62c1ddc5 --- /dev/null +++ b/trunk/fs/nilfs2/Makefile @@ -0,0 +1,5 @@ +obj-$(CONFIG_NILFS2_FS) += nilfs2.o +nilfs2-y := inode.o file.o dir.o super.o namei.o page.o mdt.o \ + btnode.o bmap.o btree.o direct.o dat.o recovery.o \ + the_nilfs.o segbuf.o segment.o cpfile.o sufile.o \ + ifile.o alloc.o gcinode.o ioctl.o gcdat.o