diff options
Diffstat (limited to 'fs/udf/namei.c')
-rw-r--r-- | fs/udf/namei.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c index cd2115060fdc..7c56ff00cd53 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c | |||
@@ -34,8 +34,8 @@ | |||
34 | #include <linux/crc-itu-t.h> | 34 | #include <linux/crc-itu-t.h> |
35 | #include <linux/exportfs.h> | 35 | #include <linux/exportfs.h> |
36 | 36 | ||
37 | static inline int udf_match(int len1, const char *name1, int len2, | 37 | static inline int udf_match(int len1, const unsigned char *name1, int len2, |
38 | const char *name2) | 38 | const unsigned char *name2) |
39 | { | 39 | { |
40 | if (len1 != len2) | 40 | if (len1 != len2) |
41 | return 0; | 41 | return 0; |
@@ -142,15 +142,15 @@ int udf_write_fi(struct inode *inode, struct fileIdentDesc *cfi, | |||
142 | } | 142 | } |
143 | 143 | ||
144 | static struct fileIdentDesc *udf_find_entry(struct inode *dir, | 144 | static struct fileIdentDesc *udf_find_entry(struct inode *dir, |
145 | struct qstr *child, | 145 | const struct qstr *child, |
146 | struct udf_fileident_bh *fibh, | 146 | struct udf_fileident_bh *fibh, |
147 | struct fileIdentDesc *cfi) | 147 | struct fileIdentDesc *cfi) |
148 | { | 148 | { |
149 | struct fileIdentDesc *fi = NULL; | 149 | struct fileIdentDesc *fi = NULL; |
150 | loff_t f_pos; | 150 | loff_t f_pos; |
151 | int block, flen; | 151 | int block, flen; |
152 | char *fname = NULL; | 152 | unsigned char *fname = NULL; |
153 | char *nameptr; | 153 | unsigned char *nameptr; |
154 | uint8_t lfi; | 154 | uint8_t lfi; |
155 | uint16_t liu; | 155 | uint16_t liu; |
156 | loff_t size; | 156 | loff_t size; |
@@ -308,7 +308,7 @@ static struct fileIdentDesc *udf_add_entry(struct inode *dir, | |||
308 | { | 308 | { |
309 | struct super_block *sb = dir->i_sb; | 309 | struct super_block *sb = dir->i_sb; |
310 | struct fileIdentDesc *fi = NULL; | 310 | struct fileIdentDesc *fi = NULL; |
311 | char *name = NULL; | 311 | unsigned char *name = NULL; |
312 | int namelen; | 312 | int namelen; |
313 | loff_t f_pos; | 313 | loff_t f_pos; |
314 | loff_t size = udf_ext0_offset(dir) + dir->i_size; | 314 | loff_t size = udf_ext0_offset(dir) + dir->i_size; |
@@ -885,16 +885,16 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, | |||
885 | { | 885 | { |
886 | struct inode *inode; | 886 | struct inode *inode; |
887 | struct pathComponent *pc; | 887 | struct pathComponent *pc; |
888 | char *compstart; | 888 | const char *compstart; |
889 | struct udf_fileident_bh fibh; | 889 | struct udf_fileident_bh fibh; |
890 | struct extent_position epos = {}; | 890 | struct extent_position epos = {}; |
891 | int eoffset, elen = 0; | 891 | int eoffset, elen = 0; |
892 | struct fileIdentDesc *fi; | 892 | struct fileIdentDesc *fi; |
893 | struct fileIdentDesc cfi; | 893 | struct fileIdentDesc cfi; |
894 | char *ea; | 894 | uint8_t *ea; |
895 | int err; | 895 | int err; |
896 | int block; | 896 | int block; |
897 | char *name = NULL; | 897 | unsigned char *name = NULL; |
898 | int namelen; | 898 | int namelen; |
899 | struct buffer_head *bh; | 899 | struct buffer_head *bh; |
900 | struct udf_inode_info *iinfo; | 900 | struct udf_inode_info *iinfo; |
@@ -970,7 +970,7 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, | |||
970 | 970 | ||
971 | pc = (struct pathComponent *)(ea + elen); | 971 | pc = (struct pathComponent *)(ea + elen); |
972 | 972 | ||
973 | compstart = (char *)symname; | 973 | compstart = symname; |
974 | 974 | ||
975 | do { | 975 | do { |
976 | symname++; | 976 | symname++; |