Release docs/kernel-docs-2.6/filesystems/ext4.txt [JF:20088]

diff --git a/docs/kernel-docs-2.6/filesystems/ext4.txt b/docs/kernel-docs-2.6/filesystems/ext4.txt
index 40eb119..c0487b6 100644 (file)
--- a/docs/kernel-docs-2.6/filesystems/ext4.txt
+++ b/docs/kernel-docs-2.6/filesystems/ext4.txt
@@ -1,9 +1,9 @@
 =========================================================
 ¤³¤ì¤Ï¡¢
-linux-3.3/Documentation/filesystems/ext4.txt ¤ÎÏÂÌõ
+linux-3.4.1/Documentation/filesystems/ext4.txt ¤ÎÏÂÌõ
 ¤Ç¤¹¡£
 ËÝÌõÃÄÂΡ§ JF ¥×¥í¥¸¥§¥¯¥È < http://www.linux.or.jp/JF/ >
-¹¹¿·Æü ¡§ 2012/05/11
+¹¹¿·Æü ¡§ 2012/06/10
 ËÝÌõ¼Ô ¡§ Seiji Kaneko < skaneko at mbn dot or dot jp >
 ººÆÉ¼Ô : Hiroshi Suzuki <setter at reset dot jp>
 =========================================================
@@ -63,7 +63,7 @@ ext4 
 #    1.41.x.
    - e2fsprogs 1.41.x ¥½¡¼¥¹ÉÕ°¤Î mke2fs.conf ¥Õ¥¡¥¤¥ë¤ò /etc/mke2fs.conf
      ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤È¤Æ¤â½ÅÍפǤ¹¡£¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¢¤ë
-     /etc/mke2fs.conf ¥Õ¥¡¥¤¥ë¤ò¤¹¤Ç¤ËÊÔ½¸¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢e2fsprogs 1.41.x 
+     /etc/mke2fs.conf ¥Õ¥¡¥¤¥ë¤ò¤¹¤Ç¤ËÊÔ½¸¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢e2fsprogs 1.41.x
      ¤ÎÈǤΤâ¤Î¤Ë´û¸¤Î½¤Àµ¤ò¥Þ¡¼¥¸¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 
 #  - Create a new filesystem using the ext4 filesystem type:
@@ -71,7 +71,7 @@ ext4 
 
        # mke2fs -t ext4 /dev/hda1
 
-#    Or to configure an existing ext3 filesystem to support extents: 
+#    Or to configure an existing ext3 filesystem to support extents:
      ¤Þ¤¿¤Ï¡¢´û¸¤Î ext3 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¡¢¥¨¥¯¥¹¥Æ¥ó¥È¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤è
      ¤¦ÀßÄꤷ¤Þ¤¹¡£
 
@@ -121,7 +121,7 @@ ext4 
     ¼¨Åª¤Ë¡¢ext3 ¤È ext4 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¤â '-o barriers=[0|1]' ¤ò»È¤Ã¤Æ
     »ØÄꤹ¤ë¤Î¤¬Ìò¤ËΩ¤Ä¤Ç¤·¤ç¤¦¡£ext4 ¤òºÇ¹â¤Î¥Ù¥ó¥Á¥Þ¡¼¥¯·ë²Ì¤È¤Ê¤ë¤è¤¦
     ¤Ë¥Á¥å¡¼¥Ë¥ó¥°¤¹¤ë¾ì¹ç¡¢¥Ç¡¼¥¿¥¸¥ã¡¼¥Ê¥ê¥ó¥°¥â¡¼¥É¤ÎÊѹ¹¤ò»î¤¹¤³¤È¤Ë¤Ï
-    ²ÁÃͤ¬¤¢¤ê¤Þ¤¹¡£Î㤨¤Ð¡¢°ìÉô¤Î¥Ù¥ó¥Á¥Þ¡¼¥¯¤Ç¤Ï 
+    ²ÁÃͤ¬¤¢¤ê¤Þ¤¹¡£Î㤨¤Ð¡¢°ìÉô¤Î¥Ù¥ó¥Á¥Þ¡¼¥¯¤Ç¤Ï
     '-o data=writeback' ¤Ï¾¤è¤ê¹â®¤È¤Ê¤ë¤Ç¤·¤ç¤¦ (Ãí°Õ¤È¤·¤Æ¡¢
     data=writeback ¥â¡¼¥É¤Ç¥Þ¥¦¥ó¥È±¿ÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥ê¡¼¥ó¤Ç¤Ê¤¤¥·¥ã¥Ã
     ¥È¥À¥¦¥ó¤ÇľÁ°¤Ë½ñ¤¤¤¿¥Ç¡¼¥¿¤¬¥´¥ß¤È¤·¤Æ»Ä¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¡¢¾õ¶·¤Ë¤è
@@ -234,8 +234,8 @@ ext4 
 #                      writes to the filesystem.
 ro                     ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¥ê¡¼¥É¥ª¥ó¥ê¡¼¤Ç¥Þ¥¦¥ó¥È¤¹¤ë¡£ext4
                        ¤Ï¥ê¡¼¥É¥ª¥ó¥ê¡¼¤Ç¥Þ¥¦¥ó¥È¤·¤¿¾ì¹ç¤Ë¤â¥¸¥ã¡¼¥Ê¥ë¤Î¥ê
-                       ¥×¥ì¥¤¤ò¹Ô¤¦ (½¾¤Ã¤Æ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë½ñ¤­¹þ¤ß¤ò¹Ô¤¦) 
-                       ¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¥Þ¥¦¥ó¥È¥ª¥×¥·¥ç¥ó 
+                       ¥×¥ì¥¤¤ò¹Ô¤¦ (½¾¤Ã¤Æ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë½ñ¤­¹þ¤ß¤ò¹Ô¤¦)
+                       ¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¥Þ¥¦¥ó¥È¥ª¥×¥·¥ç¥ó
                        "ro,noload" ¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ø¤Î½ñ¤­¹þ¤ß¤òÁ˻ߤ¹
                        ¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 
@@ -259,11 +259,6 @@ journal_async_commit       
                        ¤­¤Þ¤»¤ó¡£¤³¤ì¤Ë¤è¤ê¡¢ÆâÉôŪ¤Ë journal_checksum ¤¬
                        Í­¸ú¤Ë¤µ¤ì¤Þ¤¹¡£
 
-#journal=update                Update the ext4 file system's journal to the current
-#                      format.
-journal=update         ext4 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥¸¥ã¡¼¥Ê¥ë¤ò¸½ºß¤Î·Á¼°¤Ë¥¢¥Ã
-                       ¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£
-
 #journal_dev=devnum    When the external journal device's major/minor numbers
 #                      have changed, this option allows the user to specify
 #                      the new journal location.  The journal device is
@@ -362,8 +357,8 @@ nobarrier           
 #                      table readahead algorithm will pre-read into
 #                      the buffer cache.  The default value is 32 blocks.
 inode_readahead_blks=n ¤³¤Î¥Á¥å¡¼¥Ë¥ó¥°¥Ñ¥é¥á¡¼¥¿¤Ï¡¢ext4 inode ¥Æ¡¼¥Ö¥ëÀèÆÉ
-                       ¤ß¥¢¥ë¥´¥ê¥º¥à¤¬¥Ð¥Ã¥Õ¥¡¥­¥ã¥Ã¥·¥å¤ËÀèÆɤߤ¹¤ë¡¢inode 
-                       ¥Æ¡¼¥Ö¥ë¥Ö¥í¥Ã¥¯¤Î¿ô¤ÎºÇÂçÃͤòÀ©¸æ¤·¤Þ¤¹¡£´ûÄêÃÍ¤Ï 32 
+                       ¤ß¥¢¥ë¥´¥ê¥º¥à¤¬¥Ð¥Ã¥Õ¥¡¥­¥ã¥Ã¥·¥å¤ËÀèÆɤߤ¹¤ë¡¢inode
+                       ¥Æ¡¼¥Ö¥ë¥Ö¥í¥Ã¥¯¤Î¿ô¤ÎºÇÂçÃͤòÀ©¸æ¤·¤Þ¤¹¡£´ûÄêÃÍ¤Ï 32
                        ¥Ö¥í¥Ã¥¯¤Ç¤¹¡£
 
 #nouser_xattr          Disables Extended User Attributes. If you have extended
@@ -373,8 +368,8 @@ inode_readahead_blks=n      
 #                      page and http://acl.bestbits.at/ for more information
 #                      about extended attributes.
 nouser_xattr           POSIX ³Èĥ°À­ ¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
-                       ¤â¤·¡¢³Èĥ°À­¥µ¥Ý¡¼¥È¤¬¥«¡¼¥Í¥ëÀßÄê 
-                       (CONFIG_EXT4_FS_XATTR) ¤ÇÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢ACL 
+                       ¤â¤·¡¢³Èĥ°À­¥µ¥Ý¡¼¥È¤¬¥«¡¼¥Í¥ëÀßÄê
+                       (CONFIG_EXT4_FS_XATTR) ¤ÇÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢ACL
                        ¤Ï¥Þ¥¦¥ó¥È»þ¤Ë¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
                        POSIX ³Èĥ°À­¤Î¾ÜºÙ¤ò³Ø¤Ö¤Ë¤Ï¡¢attr(5) ¤Î¥Þ¥Ë¥å¥¢
                        ¥ë¥Ú¡¼¥¸¤È http://acl.bestbits.at ¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£
@@ -386,7 +381,7 @@ nouser_xattr                POSIX 
 #                      page and http://acl.bestbits.at/ for more information
 #                      about acl.
 noacl                  POSIX ¥¢¥¯¥»¥¹À©¸æ¥ê¥¹¥È(POSIX ACL) ¥µ¥Ý¡¼¥È¤ò̵¸ú
-                       ¤Ë¤·¤Þ¤¹¡£¤â¤·¡¢ACL ¥µ¥Ý¡¼¥È¤¬¥«¡¼¥Í¥ëÀßÄê 
+                       ¤Ë¤·¤Þ¤¹¡£¤â¤·¡¢ACL ¥µ¥Ý¡¼¥È¤¬¥«¡¼¥Í¥ëÀßÄê
                        (CONFIG_EXT4_FS_POSIX_ACL) ¤ÇÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢
                        ACL ¤Ï¥Þ¥¦¥ó¥È»þ¤Ë¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
                        acl ¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¤Ï acl(5) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ä¡¢
@@ -440,7 +435,7 @@ bsdgroups           
 nogrpid                (*)     ¥ª¥Ö¥¸¥§¥¯¥È¤ÎºîÀ®»þ¤Ë¡¢ºîÀ®Àè¥Ç¥£¥ì¥¯¥È¥ê¤Ë setgid ¥Ó
 sysvgroups             ¥Ã¥È¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢ºîÀ®¥×¥í¥»¥¹¤ÈƱ¤¸¥°¥ë¡¼¥×
                        ID ¤òÍ¿¤¨¤Þ¤¹¡£ºîÀ®Àè¥Ç¥£¥ì¥¯¥È¥ê¤Ë setgid ¥Ó¥Ã¥È¤¬¥»¥Ã
-                       ¥È¤µ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ë¤Ï¡¢ºîÀ®Àè¥Ç¥£¥ì¥¯¥È¥ê¤Î¥°¥ë¡¼¥× 
+                       ¥È¤µ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ë¤Ï¡¢ºîÀ®Àè¥Ç¥£¥ì¥¯¥È¥ê¤Î¥°¥ë¡¼¥×
                        ID ¤¬°ú¤­·Ñ¤¬¤ì¡¢¹¹¤ËºîÀ®¤µ¤ì¤¿¤Î¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¢
                        ¤Ã¤¿¾ì¹ç¤Ë¤Ï setgid ¥Ó¥Ã¥È¤â°ú¤­·Ñ¤¬¤ì¤Þ¤¹¡£
 
@@ -535,11 +530,11 @@ max_batch_time=usec       ext4 
                        ¤ë»þ´Ö (Ê¿¶Ñ»þ´Ö) ¤ò¬Äꤹ¤ë¤³¤È¤Ë¤è¤ê¡¢¥Ç¥£¥¹¥¯Â®ÅÙ¤Ë
                        ºÇŬ²½¤¹¤ë¤è¤¦À߷פµ¤ì¤¿¤â¤Î¤Ç¤¹¡£¤³¤³¤Ç¾åµ­¤Î¡Ö¥³¥ß¥Ã
                        ¥È´°Î»¤ËÍפ¹¤ë»þ´Ö¡×¤ò ¡ÉCommit time" ¤È¸Æ¤Ö¤³¤È¤Ë¤·¤Þ
-                       ¤¹¡£¤â¤·¡¢¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤ò¼Â¹Ô¤·¤Æ¤¤¤ë»þ´Ö¤¬ Commit 
+                       ¤¹¡£¤â¤·¡¢¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤ò¼Â¹Ô¤·¤Æ¤¤¤ë»þ´Ö¤¬ Commit
                        time ¤è¤ê¾®¤µ¤¤¤Ê¤é¤Ð¡¢ext4 ¤Ï Commit time ¤À¤±¥¹¥ê¡¼
                        ¥×¤·¤Æ¾¤Î½èÍý¤¬¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤Ë¹çή¤Ç¤­¤ë¤«¤É¤¦¤«¤ò
                        Ä´¤Ù¤Þ¤¹¡£¤³¤Î Commit time ¤Ï max_batch_time ¤Ë¤è¤ê
-                       ¾å¸Â¤¬»ØÄꤵ¤ì¤Þ¤¹¡£max_batch_time ¤Îɸ½àÃÍ¤Ï 
+                       ¾å¸Â¤¬»ØÄꤵ¤ì¤Þ¤¹¡£max_batch_time ¤Îɸ½àÃͤÏ
                        15000us (15ms) ¤Ç¤¹¡£max_batch_time ¤ò 0 ¤È»ØÄꤹ¤ë
                        ¤³¤È¤Ç¡¢¤³¤ÎºÇŬ²½¤ò´°Á´¤Ë̵¸ú²½¤Ç¤­¤Þ¤¹¡£
 
@@ -550,23 +545,23 @@ max_batch_time=usec       ext4 
 #                      multi-threaded, synchronous workloads on very
 #                      fast disks, at the cost of increasing latency.
 min_batch_time=usec    ¤³¤Î¥Ñ¥é¥á¡¼¥¿¤Ï commit time (¾åµ­»²¾È) ¤¬¡¢¾¯¤Ê¤¯¤È¤â
-                       min_batch_time °Ê¾å¤Ç¤¢¤ë¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£É¸½àÃÍ¤Ï 0 
+                       min_batch_time °Ê¾å¤Ç¤¢¤ë¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£É¸½àÃÍ¤Ï 0
                        ms ¤Ç¤¹¡£¤³¤Î¥Ñ¥é¥á¡¼¥¿¤òÁý¤ä¤·¤¿¾ì¹ç¡¢¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤Ç
                        Ʊ´ü¤ò»È¤¦½èÍýÉé²Ù¤ò¹â®¤Ê¥Ç¥£¥¹¥¯¤Ç¼Â¹Ô¤·¤Æ¤¤¤ë¾ì¹ç¡¢¥ì
                        ¥¤¥Æ¥ó¥·¥£¤ÎÁý²Ã¤Î¥³¥¹¥È¤òÂå½þ¤Ë¥¹¥ë¡¼¥×¥Ã¥È¤¬²þÁ±¤·¤Þ¤¹¡£
 
 #journal_ioprio=prio   The I/O priority (from 0 to 7, where 0 is the
-#                      highest priorty) which should be used for I/O
+#                      highest priority) which should be used for I/O
 #                      operations submitted by kjournald2 during a
 #                      commit operation.  This defaults to 3, which is
 #                      a slightly higher priority than the default I/O
 #                      priority.
 journal_ioprio=prio    kjournald2 ¤¬¡¢¥³¥ß¥Ã¥È½èÍýÃæ¤Ëȯ¹Ô¤¹¤ë I/O ½èÍý¤ÇÍѤ¤
                        ¤ë I/O ¥×¥é¥¤¥ª¥ê¥Æ¥£ (0 ¤«¤é 7 ¤Ç¡¢0 ¤¬ºÇ¹â¤Î¥×¥é¥¤¥ª
-                       ¥ê¥Æ¥£¤Ç¤¹) ¤ò»ØÄꤷ¤Þ¤¹¡£É¸½àÃÍ¤Ï 3 ¤Ç¡¢¤³¤ì¤ÏÄ̾ï¤Î 
+                       ¥ê¥Æ¥£¤Ç¤¹) ¤ò»ØÄꤷ¤Þ¤¹¡£É¸½àÃÍ¤Ï 3 ¤Ç¡¢¤³¤ì¤ÏÄ̾ï¤Î
                        I/O ¥×¥é¥¤¥ª¥ê¥Æ¥£¤è¤ê¾¯¤·¹â¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
 
-#auto_da_alloc(*)      Many broken applications don't use fsync() when 
+#auto_da_alloc(*)      Many broken applications don't use fsync() when
 #noauto_da_alloc               replacing existing files via patterns such as
 #                      fd = open("foo.new")/write(fd,..)/close(fd)/
 #                      rename("foo.new", "foo"), or worse yet,
@@ -585,8 +580,8 @@ journal_ioprio=prio kjournald2 
 #                      blocks are forced to disk.
 auto_da_alloc(*)       ¿¤¯¤Î²õ¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢fd = open("foo.new")/
 noauto_da_alloc                write(fd,..)/close(fd)/rename("foo.new", "foo") ¤Ê
-                       ¤É¤Î¥Ñ¥¿¡¼¥ó¡¢¤¢¤ë¤¤¤Ï¤½¤ì¤è¤ê¼Ù°­¤Ê 
-                       fd = open("foo", O_TRUNC)/write(fd,..)/close(fd) 
+                       ¤É¤Î¥Ñ¥¿¡¼¥ó¡¢¤¢¤ë¤¤¤Ï¤½¤ì¤è¤ê¼Ù°­¤Ê
+                       fd = open("foo", O_TRUNC)/write(fd,..)/close(fd)
                        ¥Ñ¥¿¡¼¥ó¤Ç¡¢fsync() ¤ò»È¤ï¤Ê¤¤¤Ç´û¸¤Î¥Õ¥¡¥¤¥ë¤òÆþ¤ì
                        Âؤ¨¤Þ¤¹¡£auto_da_alloc ¤¬Í­¸ú¤Ê¾ì¹ç¡¢ext4 ¤Ï¤³¤Î¥ê
                        ¥Í¡¼¥à¤Ë¤è¤ë¥Õ¥¡¥¤¥ë¤ÎÆþ¤ìÂؤ¨¤È truncate ¤Ë¤è¤ë¥Õ¥¡
@@ -615,7 +610,7 @@ noinit_itable               
 #init_itable=n         The lazy itable init code will wait n times the
 #                      number of milliseconds it took to zero out the
 #                      previous block group's inode table.  This
-#                      minimizes the impact on the systme performance
+#                      minimizes the impact on the system performance
 #                      while file system's inode table is being initialized.
 init_itable=n          itable ¤ÎÃÙ±ä½é´ü²½¥³¡¼¥É¤Ï¡¢Á°¤Î inode ¥Æ¡¼¥Ö¥ë¥Ö¥í
                        ¥Ã¥¯¤Î 0 ¥¯¥ê¥¢¸å¡¢n ¥ß¥êÉÃÂԤäƼ¡¤Î½é´ü²½¤ò¼Â¹Ô¤·¤Þ
@@ -641,16 +636,6 @@ nouid32                    32-bit UID 
                        16 bit ÃͤΤߤò½ñ¤­¹þ¤ß¡¢ÍøÍѤ¹¤ë¸Å¤¤¥«¡¼¥Í¥ë¤È¤Î¸ß
                        ´¹À­¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
 
-#resize                        Allows to resize filesystem to the end of the last
-#                      existing block group, further resize has to be done
-#                      with resize2fs either online, or offline. It can be
-#                      used only with conjunction with remount.
-resize                 ºÇ½ª¤Î»ÈÍѺѤߤΥ֥í¥Ã¥¯¥°¥ë¡¼¥×¤Ø¤Î¥ê¥µ¥¤¥º¤òµö¤·
-                       ¤Þ¤¹¡£¤³¤ì°Ê¾å¤Î¥ê¥µ¥¤¥º¤Ï¡¢¥ª¥ó¥é¥¤¥ó¤Þ¤¿¤Ï¥ª¥Õ¥é
-                       ¥¤¥ó¤Ç resize2fs¤òÍѤ¤¤Æ¹Ô¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£¥ê¥µ¥¤
-                       ¥º¸å¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ï remount ¸å¤ËÍøÍѲÄǽ¤Ë¤Ê¤ê
-                       ¤Þ¤¹¡£
-
 #block_validity                This options allows to enables/disables the in-kernel
 #noblock_validity      facility for tracking filesystem metadata blocks
 #                      within internal data structures. This allows multi-
@@ -684,7 +669,7 @@ dioread_lock                ext4 
 dioread_nolock         ¤â¤· dioread_nolock ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç
                        ¤Ï¡¢ext4 ¤Ï¥Ð¥Ã¥Õ¥¡¥é¥¤¥ÈÁ°¤Ë̤½é´ü²½¾õÂ֤Υ¨¥¯¥¹¥Æ
                        ¥ó¥È¤ò³ä¤êÅö¤Æ¡¢IO ½ªÎ»¸å¤Ë¥¨¥¯¥¹¥Æ¥ó¥È¤ò½é´ü²½¾õÂÖ
-                       ¤ËÊѹ¹¤·¤Þ¤¹¡£¤³¤Î¼ê½ç¤Ë¤è¤ê¡¢ext4 ¤Ç inode mutex 
+                       ¤ËÊѹ¹¤·¤Þ¤¹¡£¤³¤Î¼ê½ç¤Ë¤è¤ê¡¢ext4 ¤Ç inode mutex
                        ¤ò»È¤ï¤Ê¤¤¤ÇºÑ¤à¤è¤¦¤Ë¤Ê¤ë¤¿¤á¡¢¹â®¤Ê¥¹¥È¥ì¡¼¥¸¤ò
                        »È¤Ã¤¿¾ì¹ç¤Î¥·¥¹¥Æ¥à¤Î³ÈÄ¥À­¤¬¸þ¾å¤·¤Þ¤¹¡£¤¿¤À¤·¡¢
                        ¤³¤Îµ¡Ç½¤Ï¥Ç¡¼¥¿¥¸¥ã¡¼¥Ê¥ê¥ó¥°¤È¶¦¤Ë¤Ï»È¤¨¤º¡¢¥Ç¡¼
@@ -725,7 +710,7 @@ data=writeback 
 #groups metadata information related to data changes with the data blocks into a
 #single unit called a transaction.  When it's time to write the new metadata
 #out to disk, the associated data blocks are written first.  In general,
-#this mode performs slightly slower than writeback but significantly faster 
+#this mode performs slightly slower than writeback but significantly faster
 #than journal mode.
 * ¥ª¡¼¥À¡¼¥É¥â¡¼¥É (ordered mode)
 data=ordered ¥â¡¼¥É¤Î¤È¤­¡¢ext4 ¤Ï¸ø¼°¤Ë¤Ï¥á¥¿¥Ç¡¼¥¿¤Î¤ß¤ò¥¸¥ã¡¼¥Ê¥ë¤·¤Þ¤¹
@@ -749,7 +734,7 @@ data=journal 
 ¤­¤³¤Þ¤ì¤Þ¤¹¡£¥¯¥é¥Ã¥·¥å¤ÎºÝ¡¢¥¸¥ã¡¼¥Ê¥ë¤Ï¥ê¥×¥ì¥¤¤µ¤ì¡¢¥Ç¡¼¥¿¤È¥á¥¿¥Ç¡¼¥¿
 ¤ÎξÊý¤ÏÌ·½â¤Î̵¤¤¾õÂ֤˲óÉü¤µ¤ì¤Þ¤¹¡£¤³¤Î¥â¡¼¥É¤ÏÄ̾ï¤Ï¤â¤Ã¤È¤âÃÙ¤¤¤â¤Î¤Ç
 ¤¹¤¬¡¢¥Ç¥£¥¹¥¯¤Ø¤Î¥Ç¡¼¥¿¤ÎÆɤߤÀ¤·¤È½ñ¤­¹þ¤ß¤òƱ»þ¤Ë¹Ô¤¦É¬Íפ¬¤¢¤ë»þ¤Ï¡¢Â¾
-¤Î¥â¡¼¥É¤è¤ê¹âÀ­Ç½¤Ç¤¹¡£¤³¤Î¥â¡¼¥É¤òÍ­¸ú¤Ë¤·¤¿¾ì¹ç¡¢Ãٱ䥢¥í¥±¡¼¥·¥ç¥ó¤È 
+¤Î¥â¡¼¥É¤è¤ê¹âÀ­Ç½¤Ç¤¹¡£¤³¤Î¥â¡¼¥É¤òÍ­¸ú¤Ë¤·¤¿¾ì¹ç¡¢Ãٱ䥢¥í¥±¡¼¥·¥ç¥ó¤È
 O_DIRECT ¥µ¥Ý¡¼¥È¤Ï̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
 
 
@@ -765,7 +750,7 @@ O_DIRECT 
 #in table below.
 ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤ë ext4 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¾ðÊó¤Ï /proc/fs/ext4 ¤«¤é¼èÆÀ¤Ç
 ¤­¤Þ¤¹¡£¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î³Æ¡¹¤ËÂбþ¤·¤¿¡¢¥Ç¥Ð¥¤¥¹Ì¾¤ò¸µ
-¤Ë¤·¤¿Ì¾¾Î¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬ /proc/fs/ext4 °Ê²¼¤ËºîÀ®¤µ¤ì¤Þ¤¹ (Î㤨¤Ð 
+¤Ë¤·¤¿Ì¾¾Î¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬ /proc/fs/ext4 °Ê²¼¤ËºîÀ®¤µ¤ì¤Þ¤¹ (Î㤨¤Ð
 /proc/fs/ext4/hdc ¤ä /proc/fs/ext4/dm-0)¡£³Æ¥Ç¥Ð¥¤¥¹¤´¤È¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î
 ¥Õ¥¡¥¤¥ë¤Ï°Ê²¼¤Î¥Æ¡¼¥Ö¥ë¤Î¤È¤ª¤ê¤Ç¤¹¡£
 
@@ -791,7 +776,7 @@ O_DIRECT 
 #in table below.
 ¥Þ¥¦¥ó¥È¤µ¤ì¤¿ ext4 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¾ðÊó¤Ï /sys/fs/ext4 ¤«¤é¼èÆÀ¤Ç¤­¤Þ¤¹¡£
 ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î³Æ¡¹¤ËÂбþ¤·¤Æ¡¢¥Ç¥Ð¥¤¥¹Ì¾¤ò¸µ¤Ë¤·¤¿Ì¾
-¾Î¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬ /sys/fs/ext4 °Ê²¼¤ËºîÀ®¤µ¤ì¤Þ¤¹ (Î㤨¤Ð 
+¾Î¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬ /sys/fs/ext4 °Ê²¼¤ËºîÀ®¤µ¤ì¤Þ¤¹ (Î㤨¤Ð
 /sys/fs/ext4/hdc ¤ä /sys/fs/ext4/dm-0)¡£³Æ¥Ç¥Ð¥¤¥¹¤´¤È¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î
 ¥Õ¥¡¥¤¥ë¤Ï°Ê²¼¤Î¥Æ¡¼¥Ö¥ë¤Î¤È¤ª¤ê¤Ç¤¹¡£
 
@@ -946,8 +931,8 @@ ext4 
 #                            particularly useful for network filesystems. The
 #                            '_OLD' version of this ioctl is an alias for
 #                            FS_IOC_GETVERSION.
-                            ³Æ inode ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë inode ¤Î 
-                            i_generation ÈÖ¹æ¤ò¼èÆÀ¤·¤Þ¤¹¡£i_generation 
+                            ³Æ inode ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë inode ¤Î
+                            i_generation ÈÖ¹æ¤ò¼èÆÀ¤·¤Þ¤¹¡£i_generation
                             ÈÖ¹æ¤ÏÄ̾￷¤·¤¤ inode ¤¬ºîÀ®¤µ¤ì¤ë¾ì¹ç¤Ë¤Î¤ß
                             Êѹ¹¤µ¤ì¡¢¥Í¥Ã¥È¥ï¡¼¥¯¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÇÆäËÍ­ÍѤǤ¹¡£
                             _OLD ¤ÎÉÕ¤¯ÈǤΠioctl ¤Ï FS_IOC_GETVERSION ¤Î
@@ -958,7 +943,7 @@ ext4 
 #                            Set the inode i_generation number stored for
 #                            each inode. The '_OLD' version of this ioctl
 #                            is an alias for FS_IOC_SETVERSION.
-                            ³Æ inode ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë inode ¤Î 
+                            ³Æ inode ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤ë inode ¤Î
                             i_generation ÈÖ¹æ¤òÀßÄꤷ¤Þ¤¹¡£
                             _OLD ¤ÎÉÕ¤¯ÈǤΠioctl ¤Ï FS_IOC_SETVERSION ¤Î
                             ÊÌ̾¤Ç¤¹¡£
@@ -1011,7 +996,7 @@ ext4 
                             ¿ô¤È¤·¤ÆÅϤµ¤ì¤ë ext4_new_group_input ¹½Â¤ÂΤË
                             µ­ºÜ¤µ¤ì¤Þ¤¹¡£
                             ¤³¤Îµ¡Ç½¤ÏºÇ½ª¤Î»ÈÍѺѤߤΥ֥í¥Ã¥¯¥°¥ë¡¼¥×¤Ø¤Î
-                            ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ª¥ó¥é¥¤¥ó¥ê¥µ¥¤¥º¤ò¹Ô¤¦ 
+                            ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ª¥ó¥é¥¤¥ó¥ê¥µ¥¤¥º¤ò¹Ô¤¦
                             EXT4_IOC_GROUP_EXTEND µ¡Ç½¤ÈÁȤ߹ç¤ï¤»¤Æ»È¤¦¤È
                             ÊØÍø¤Ç¤¹¡£¤³¤Î 2 ¤Ä¤Î ioctl ¤Ï¥æ¡¼¥¶¶õ´Ö¥ª¥ó¥é
                             ¥¤¥ó¥ê¥µ¥¤¥º¥Ä¡¼¥ë (¤Ä¤Þ¤ê resize2fs) ¤ÇÁȤ߹ç
@@ -1033,9 +1018,9 @@ ext4 
                             ¤³¤ì¤Ï¡¢ext3 ¤Î´ÖÀÜ¥Ö¥í¥Ã¥¯¥Þ¥Ã¥×¤µ¤ì¤¿ inode
                             ¤ò ext4 ¤Î¥¨¥¯¥¹¥Æ¥ó¥È¥Þ¥Ã¥×¤µ¤ì¤¿ inode ¤Ë¡¢
                             ¸µ¤Î inode ¤Î´ÖÀÜ¥Ö¥í¥Ã¥¯¥Þ¥Ã¥×¤ò¼ê·«¤Ã¤ÆÎÙÀÜ
-                            ¥Ö¥í¥Ã¥¯ÈϰϤËÊÑ´¹¤·¤Æ¹¹¤Ë°ì»þ inode ¤Î ext4 
+                            ¥Ö¥í¥Ã¥¯ÈϰϤËÊÑ´¹¤·¤Æ¹¹¤Ë°ì»þ inode ¤Î ext4
                             ¥¨¥¯¥¹¥Æ¥ó¥È¤ËÊÑ´¹¡¢¤½¤Î¤¢¤È inode ¤ò¸ò´¹¤¹¤ë
-                            ¤³¤È¤Ë¤è¤êÊÑ´¹¤·¤Æ°Ü¹Ô¤·¤Þ¤¹¡£¤³¤Îµ¡Ç½¤Ï ext3 
+                            ¤³¤È¤Ë¤è¤êÊÑ´¹¤·¤Æ°Ü¹Ô¤·¤Þ¤¹¡£¤³¤Îµ¡Ç½¤Ï ext3
                             ¤«¤é ext4 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ø¤Î°Ü¹Ô»þ¤ËÍøÍѲÄǽ
                             ¤Ç¤¹¤¬¡¢ext4 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò¿·µ¬¤Ëºî¤Ã¤Æ¤½
                             ¤³¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤«¤é¥Ç¡¼¥¿¤ò¥³¥Ô¡¼¤¹¤ëÊý¤¬¤è¤ê
@@ -1051,7 +1036,7 @@ ext4 
 #                            not necessary and has been done this way only
 #                            for sake of simplicity.
  EXT4_IOC_ALLOC_DA_BLKS             ÃÙ±ä³ä¤êÅö¤ÆÂоݤΥ֥í¥Ã¥¯¤ò¶¯À©Åª¤ËÁ´¤Æ³ä¤êÅö
-                            ¤Æ¤ë¤³¤È¤Ë¤è¤ê¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é¸«¤Æ ext3 
+                            ¤Æ¤ë¤³¤È¤Ë¤è¤ê¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤«¤é¸«¤Æ ext3
                             ¤ÎµóÆ°¤ÈƱ¤¸¤Ë¤Ê¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤Îµ¡Ç½¤Ë¤è¤ê
                             ¸½ºß¤Î¼ÂÁõ¤Ç¤Ï¥Ç¡¼¥¿¥Ö¥í¥Ã¥¯¤Î½ñ¤­¹þ¤ß¤¬»Ï¤Þ¤ë
                             ¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤¿¤À¤·¡¢¤³¤Î¿¶¤ëÉñ¤¤¤Ï

diff --git a/docs/kernel-docs-2.6/filesystems/ext4.txt.info b/docs/kernel-docs-2.6/filesystems/ext4.txt.info
index f7a9f91..022b761 100644 (file)
--- a/docs/kernel-docs-2.6/filesystems/ext4.txt.info
+++ b/docs/kernel-docs-2.6/filesystems/ext4.txt.info
@@ -2,8 +2,8 @@ ATRB: MISC
 TITL: Ext4 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à
 CONT: Ext4 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î²òÀâ
 NAME: filesystems/ext4.txt
-JDAT: 2012/05/11
-BVER: 3.3
+JDAT: 2012/06/10
+BVER: 3.4.1
 AUTH: unknown
 TRNS: Seiji Kaneko < skaneko at mbn dot or dot jp >
 ITEM: etc

diff --git a/www/news.m4 b/www/news.m4
index 4c9223a..b995588 100644 (file)
--- a/www/news.m4
+++ b/www/news.m4
@@ -45,6 +45,9 @@ m4_define(`_NEW_DOC',`
    </DT>')
 
  <DL>
+_UPD_DOC(kernel-docs-2.6/filesystems/ext4.txt.html,2012/06/11,
+       `kernel-3.4.1 ÉÕ° filesystems/ext4.txt ¤ÎÆüËܸìÌõ')
+
 _UPD_DOC(kernel-docs-2.6/filesystems/ext4.txt.html,2012/05/12,
        `kernel-3.3 ÉÕ° filesystems/ext4.txt ¤ÎÆüËܸìÌõ')