diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 03:18:29 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:08 -0500 |
commit | faa17292fd3a5a80345511ea341a59ac40ab59dc (patch) | |
tree | 28ae7b2aa85f632053b2d78daf700609106e99b6 /fs/udf/super.c | |
parent | 541af6a07474352e2143a0527c2b62b732439815 (diff) |
udf: propagate umode_t
note re mount options: fmask and dmask are explicitly truncated to 12bit,
UDF_INVALID_MODE just needs to be guaranteed to differ from any such value.
And umask is used only in &= with umode_t, so we ignore other bits anyway.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/udf/super.c')
-rw-r--r-- | fs/udf/super.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 7cbe669e1026..c94fc889a486 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
@@ -195,11 +195,11 @@ struct udf_options { | |||
195 | unsigned int fileset; | 195 | unsigned int fileset; |
196 | unsigned int rootdir; | 196 | unsigned int rootdir; |
197 | unsigned int flags; | 197 | unsigned int flags; |
198 | mode_t umask; | 198 | umode_t umask; |
199 | gid_t gid; | 199 | gid_t gid; |
200 | uid_t uid; | 200 | uid_t uid; |
201 | mode_t fmode; | 201 | umode_t fmode; |
202 | mode_t dmode; | 202 | umode_t dmode; |
203 | struct nls_table *nls_map; | 203 | struct nls_table *nls_map; |
204 | }; | 204 | }; |
205 | 205 | ||
@@ -279,11 +279,11 @@ static int udf_show_options(struct seq_file *seq, struct vfsmount *mnt) | |||
279 | if (UDF_QUERY_FLAG(sb, UDF_FLAG_GID_SET)) | 279 | if (UDF_QUERY_FLAG(sb, UDF_FLAG_GID_SET)) |
280 | seq_printf(seq, ",gid=%u", sbi->s_gid); | 280 | seq_printf(seq, ",gid=%u", sbi->s_gid); |
281 | if (sbi->s_umask != 0) | 281 | if (sbi->s_umask != 0) |
282 | seq_printf(seq, ",umask=%o", sbi->s_umask); | 282 | seq_printf(seq, ",umask=%ho", sbi->s_umask); |
283 | if (sbi->s_fmode != UDF_INVALID_MODE) | 283 | if (sbi->s_fmode != UDF_INVALID_MODE) |
284 | seq_printf(seq, ",mode=%o", sbi->s_fmode); | 284 | seq_printf(seq, ",mode=%ho", sbi->s_fmode); |
285 | if (sbi->s_dmode != UDF_INVALID_MODE) | 285 | if (sbi->s_dmode != UDF_INVALID_MODE) |
286 | seq_printf(seq, ",dmode=%o", sbi->s_dmode); | 286 | seq_printf(seq, ",dmode=%ho", sbi->s_dmode); |
287 | if (UDF_QUERY_FLAG(sb, UDF_FLAG_SESSION_SET)) | 287 | if (UDF_QUERY_FLAG(sb, UDF_FLAG_SESSION_SET)) |
288 | seq_printf(seq, ",session=%u", sbi->s_session); | 288 | seq_printf(seq, ",session=%u", sbi->s_session); |
289 | if (UDF_QUERY_FLAG(sb, UDF_FLAG_LASTBLOCK_SET)) | 289 | if (UDF_QUERY_FLAG(sb, UDF_FLAG_LASTBLOCK_SET)) |