summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 18:50:39 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 18:50:39 +0200
commit03c3fa0a3bf48dcb024263a9ea41daecacbc6efa (patch)
tree8fcd8410094e86cb9e58efd835e8e70b6b928788 /Documentation
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/rcu-doc-2.6 (diff)
parentudf: Don't write integrity descriptor too often (diff)
downloadlinux-03c3fa0a3bf48dcb024263a9ea41daecacbc6efa.tar.xz
linux-03c3fa0a3bf48dcb024263a9ea41daecacbc6efa.zip
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: udf: Don't write integrity descriptor too often udf: Try anchor in block 256 first udf: Some type fixes and cleanups udf: use hardware sector size udf: fix novrs mount option udf: Fix oops when invalid character in filename occurs udf: return f_fsid for statfs(2) udf: Add checks to not underflow sector_t udf: fix default mode and dmode options handling udf: fix sparse warnings: udf: unsigned last[i] cannot be less than 0 udf: implement mode and dmode mounting options udf: reduce stack usage of udf_get_filename udf: reduce stack usage of udf_load_pvoldesc Fix the udf code not to pass structs on stack where possible. Remove struct typedefs from fs/udf/ecma_167.h et al.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/udf.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/filesystems/udf.txt b/Documentation/filesystems/udf.txt
index fde829a756e6..902b95d0ee51 100644
--- a/Documentation/filesystems/udf.txt
+++ b/Documentation/filesystems/udf.txt
@@ -24,6 +24,8 @@ The following mount options are supported:
gid= Set the default group.
umask= Set the default umask.
+ mode= Set the default file permissions.
+ dmode= Set the default directory permissions.
uid= Set the default user.
bs= Set the block size.
unhide Show otherwise hidden files.