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/inode.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/inode.c')
-rw-r--r-- | fs/udf/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 4fd1d809738c..4598904be1bb 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
@@ -48,7 +48,7 @@ MODULE_LICENSE("GPL"); | |||
48 | 48 | ||
49 | #define EXTENT_MERGE_SIZE 5 | 49 | #define EXTENT_MERGE_SIZE 5 |
50 | 50 | ||
51 | static mode_t udf_convert_permissions(struct fileEntry *); | 51 | static umode_t udf_convert_permissions(struct fileEntry *); |
52 | static int udf_update_inode(struct inode *, int); | 52 | static int udf_update_inode(struct inode *, int); |
53 | static void udf_fill_inode(struct inode *, struct buffer_head *); | 53 | static void udf_fill_inode(struct inode *, struct buffer_head *); |
54 | static int udf_sync_inode(struct inode *inode); | 54 | static int udf_sync_inode(struct inode *inode); |
@@ -1452,9 +1452,9 @@ static int udf_alloc_i_data(struct inode *inode, size_t size) | |||
1452 | return 0; | 1452 | return 0; |
1453 | } | 1453 | } |
1454 | 1454 | ||
1455 | static mode_t udf_convert_permissions(struct fileEntry *fe) | 1455 | static umode_t udf_convert_permissions(struct fileEntry *fe) |
1456 | { | 1456 | { |
1457 | mode_t mode; | 1457 | umode_t mode; |
1458 | uint32_t permissions; | 1458 | uint32_t permissions; |
1459 | uint32_t flags; | 1459 | uint32_t flags; |
1460 | 1460 | ||