tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
fs/Kconfig: move nilfs2 out

Linus Torvalds 1f9758d4 49ed6573

+26 -26
unified split
+1 -26
fs/Kconfig
··· 186 186 source "fs/sysv/Kconfig" 187 187 source "fs/ufs/Kconfig" 188 188 source "fs/exofs/Kconfig" 189 - 190 - config NILFS2_FS 191 - tristate "NILFS2 file system support (EXPERIMENTAL)" 192 - depends on BLOCK && EXPERIMENTAL 193 - select CRC32 194 - help 195 - NILFS2 is a log-structured file system (LFS) supporting continuous 196 - snapshotting. In addition to versioning capability of the entire 197 - file system, users can even restore files mistakenly overwritten or 198 - destroyed just a few seconds ago. Since this file system can keep 199 - consistency like conventional LFS, it achieves quick recovery after 200 - system crashes. 201 - 202 - NILFS2 creates a number of checkpoints every few seconds or per 203 - synchronous write basis (unless there is no change). Users can 204 - select significant versions among continuously created checkpoints, 205 - and can change them into snapshots which will be preserved for long 206 - periods until they are changed back to checkpoints. Each 207 - snapshot is mountable as a read-only file system concurrently with 208 - its writable mount, and this feature is convenient for online backup. 209 - 210 - Some features including atime, extended attributes, and POSIX ACLs, 211 - are not supported yet. 212 - 213 - To compile this file system support as a module, choose M here: the 214 - module will be called nilfs2. If unsure, say N. 189 + source "fs/nilfs2/Kconfig" 215 190 216 191 endif # MISC_FILESYSTEMS 217 192
+25
fs/nilfs2/Kconfig
··· 1 + config NILFS2_FS 2 + tristate "NILFS2 file system support (EXPERIMENTAL)" 3 + depends on BLOCK && EXPERIMENTAL 4 + select CRC32 5 + help 6 + NILFS2 is a log-structured file system (LFS) supporting continuous 7 + snapshotting. In addition to versioning capability of the entire 8 + file system, users can even restore files mistakenly overwritten or 9 + destroyed just a few seconds ago. Since this file system can keep 10 + consistency like conventional LFS, it achieves quick recovery after 11 + system crashes. 12 + 13 + NILFS2 creates a number of checkpoints every few seconds or per 14 + synchronous write basis (unless there is no change). Users can 15 + select significant versions among continuously created checkpoints, 16 + and can change them into snapshots which will be preserved for long 17 + periods until they are changed back to checkpoints. Each 18 + snapshot is mountable as a read-only file system concurrently with 19 + its writable mount, and this feature is convenient for online backup. 20 + 21 + Some features including atime, extended attributes, and POSIX ACLs, 22 + are not supported yet. 23 + 24 + To compile this file system support as a module, choose M here: the 25 + module will be called nilfs2. If unsure, say N.