aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:32:30 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:32:30 -0400
commit18062a91d2ddc40e19fc674afeb7cad58cfa23ab (patch)
tree886fe7ec99623767e38ff7fc67a078918338bb3e /Documentation
parentbe3478ddb8a3902b588c840b42e166a0e64a87b3 (diff)
parent05ec9e26be1f668ccba4ca54d9a4966c6208c611 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: Fix race waking up jfsIO kernel thread JFS: use __set_current_state() Copy i_flags to jfs inode flags on write JFS: document uid, gid, and umask mount options in jfs.txt
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/jfs.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/filesystems/jfs.txt b/Documentation/filesystems/jfs.txt
index bae128663748..26ebde77e821 100644
--- a/Documentation/filesystems/jfs.txt
+++ b/Documentation/filesystems/jfs.txt
@@ -29,7 +29,13 @@ errors=continue Keep going on a filesystem error.
29errors=remount-ro Default. Remount the filesystem read-only on an error. 29errors=remount-ro Default. Remount the filesystem read-only on an error.
30errors=panic Panic and halt the machine if an error occurs. 30errors=panic Panic and halt the machine if an error occurs.
31 31
32Please send bugs, comments, cards and letters to shaggy@austin.ibm.com. 32uid=value Override on-disk uid with specified value
33gid=value Override on-disk gid with specified value
34umask=value Override on-disk umask with specified octal value. For
35 directories, the execute bit will be set if the corresponding
36 read bit is set.
37
38Please send bugs, comments, cards and letters to shaggy@linux.vnet.ibm.com.
33 39
34The JFS mailing list can be subscribed to by using the link labeled 40The JFS mailing list can be subscribed to by using the link labeled
35"Mail list Subscribe" at our web page http://jfs.sourceforge.net/ 41"Mail list Subscribe" at our web page http://jfs.sourceforge.net/