Skip to contentSkip to conversation

rename swapfs to tmpfs against 2.4.1-ac1

PATCH New Christoph Rohland 1 participant 1 message Feb 1, 2001

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rename swapfs to tmpfs against 2.4.1-ac1

Hi Alan,

I decided to rename swapfs to tmpfs for administration but to call it virtual memory fs in Documentation.

Further on the wine people asked me to export shmem_file_setup.

The attached patch does this an updates the docu.

Greetings
Christoph

Documentation/Configure.help +16 -13
diff -uNr 2.4.1-ac1/Documentation/Configure.help 2.4.1-ac1-tmpfs/Documentation/Configure.help
@@ -11203,31 +11203,34 @@
 
   If unsure, say N.
    
-Swap file system support
-CONFIG_SWAPFS
-  Swapfs is a file system which keeps all files in RAM and swap space.
+Virtual memory file system support
+CONFIG_TMPFS
+  Tmpfs is a file system which keeps all files in virtual memory.
 
   In contrast to RAM disks, which get allocated a fixed amount of
-  physical RAM, swapfs grows and shrinks to accommodate the files it
+  physical RAM, tmpfs grows and shrinks to accommodate the files it
   contains and is able to swap unneeded pages out to swap space.
 
   Everything is "virtual" in the sense that no files will be created
-  on your hard drive; if you reboot, everything in swapfs will be
+  on your hard drive; if you reboot, everything in tmpfs will be
   lost.
   
-  You should mount the filesystem under /dev/shm to be able to use
+  You should mount the filesystem somewhere to be able to use
   POSIX shared memory. Adding the following line to /etc/fstab should
   take care of things:
 
-  swapfs	/dev/shm	swapfs		defaults	0 0
+  tmpfs		/dev/shm	tmpfs		defaults	0 0
 
-  Remember to create the directory that you intend to mount swapfs on
-  if necessary (The entry is automagically created if you use devfs).
+  Remember to create the directory that you intend to mount tmpfs on
+  if necessary (/dev/shm is automagically created if you use devfs).
 
   You can set limits for the number of blocks and inodes used by the
-  filesystem with the mount options "nr_blocks" and "nr_inodes". The
-  initial permissions of the root directory can be set with the mount
-  option "mode".
+  filesystem with the mount options "size", "nr_blocks" and
+  "nr_inodes". These parameters accept a suffix k, m or g for kilo,
+  mega and giga and can be changed on remount.
+  
+  The initial permissions of the root directory can be set with the
+  mount option "mode".
 
 Simple RAM-based file system support
 CONFIG_RAMFS
@@ -11236,7 +11239,7 @@
 
   It is more of an programming example than a useable filesystem. If
   you need a file system which lives in RAM with limit checking use
-  swapfs.
+  tmpfs.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
fs/Config.in +1 -1
diff -uNr 2.4.1-ac1/fs/Config.in 2.4.1-ac1-tmpfs/fs/Config.in
@@ -31,7 +31,7 @@
    int 'JFFS debugging verbosity (0 = quiet, 3 = noisy)' CONFIG_JFFS_FS_VERBOSE 0
 fi
 tristate 'Compressed ROM file system support' CONFIG_CRAMFS
-bool 'Swap file system support (former shm fs)' CONFIG_SWAPFS
+bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
 tristate 'Simple RAM-based file system support' CONFIG_RAMFS
 
 tristate 'ISO 9660 CDROM file system support' CONFIG_ISO9660_FS
mm/shmem.c +26 -23

151 lines not on this page · raw message

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/