diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 03:19:52 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:08 -0500 |
commit | 7328bdd6cf5e032a2c54e4b1cf555ff769af08e7 (patch) | |
tree | 29a862f807a7ddb6e6070c8e784ce4404b2bb7b8 /fs/isofs | |
parent | faa17292fd3a5a80345511ea341a59ac40ab59dc (diff) |
isofs: propagate umode_t
situation with mount options is the same as for udf
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/isofs')
-rw-r--r-- | fs/isofs/inode.c | 4 | ||||
-rw-r--r-- | fs/isofs/isofs.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index b71f6311a337..7b99f5f460be 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
@@ -169,8 +169,8 @@ struct iso9660_options{ | |||
169 | unsigned char map; | 169 | unsigned char map; |
170 | unsigned char check; | 170 | unsigned char check; |
171 | unsigned int blocksize; | 171 | unsigned int blocksize; |
172 | mode_t fmode; | 172 | umode_t fmode; |
173 | mode_t dmode; | 173 | umode_t dmode; |
174 | gid_t gid; | 174 | gid_t gid; |
175 | uid_t uid; | 175 | uid_t uid; |
176 | char *iocharset; | 176 | char *iocharset; |
diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h index 7d33de84f52a..0e73f63d9274 100644 --- a/fs/isofs/isofs.h +++ b/fs/isofs/isofs.h | |||
@@ -50,14 +50,14 @@ struct isofs_sb_info { | |||
50 | unsigned int s_uid_set:1; | 50 | unsigned int s_uid_set:1; |
51 | unsigned int s_gid_set:1; | 51 | unsigned int s_gid_set:1; |
52 | 52 | ||
53 | mode_t s_fmode; | 53 | umode_t s_fmode; |
54 | mode_t s_dmode; | 54 | umode_t s_dmode; |
55 | gid_t s_gid; | 55 | gid_t s_gid; |
56 | uid_t s_uid; | 56 | uid_t s_uid; |
57 | struct nls_table *s_nls_iocharset; /* Native language support table */ | 57 | struct nls_table *s_nls_iocharset; /* Native language support table */ |
58 | }; | 58 | }; |
59 | 59 | ||
60 | #define ISOFS_INVALID_MODE ((mode_t) -1) | 60 | #define ISOFS_INVALID_MODE ((umode_t) -1) |
61 | 61 | ||
62 | static inline struct isofs_sb_info *ISOFS_SB(struct super_block *sb) | 62 | static inline struct isofs_sb_info *ISOFS_SB(struct super_block *sb) |
63 | { | 63 | { |