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/udf_sb.h | |
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/udf_sb.h')
-rw-r--r-- | fs/udf/udf_sb.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h index 5142a82e3276..42ad69ac9576 100644 --- a/fs/udf/udf_sb.h +++ b/fs/udf/udf_sb.h | |||
@@ -50,7 +50,7 @@ | |||
50 | #define UDF_SPARABLE_MAP15 0x1522U | 50 | #define UDF_SPARABLE_MAP15 0x1522U |
51 | #define UDF_METADATA_MAP25 0x2511U | 51 | #define UDF_METADATA_MAP25 0x2511U |
52 | 52 | ||
53 | #define UDF_INVALID_MODE ((mode_t)-1) | 53 | #define UDF_INVALID_MODE ((umode_t)-1) |
54 | 54 | ||
55 | #pragma pack(1) /* XXX(hch): Why? This file just defines in-core structures */ | 55 | #pragma pack(1) /* XXX(hch): Why? This file just defines in-core structures */ |
56 | 56 | ||
@@ -127,11 +127,11 @@ struct udf_sb_info { | |||
127 | struct buffer_head *s_lvid_bh; | 127 | struct buffer_head *s_lvid_bh; |
128 | 128 | ||
129 | /* Default permissions */ | 129 | /* Default permissions */ |
130 | mode_t s_umask; | 130 | umode_t s_umask; |
131 | gid_t s_gid; | 131 | gid_t s_gid; |
132 | uid_t s_uid; | 132 | uid_t s_uid; |
133 | mode_t s_fmode; | 133 | umode_t s_fmode; |
134 | mode_t s_dmode; | 134 | umode_t s_dmode; |
135 | /* Lock protecting consistency of above permission settings */ | 135 | /* Lock protecting consistency of above permission settings */ |
136 | rwlock_t s_cred_lock; | 136 | rwlock_t s_cred_lock; |
137 | 137 | ||