diff options
Diffstat (limited to 'fs/ufs/dir.c')
| -rw-r--r-- | fs/ufs/dir.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index 22af68f8b682..317a0d444f6b 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | * len <= UFS_MAXNAMLEN and de != NULL are guaranteed by caller. | 31 | * len <= UFS_MAXNAMLEN and de != NULL are guaranteed by caller. |
| 32 | */ | 32 | */ |
| 33 | static inline int ufs_match(struct super_block *sb, int len, | 33 | static inline int ufs_match(struct super_block *sb, int len, |
| 34 | const char * const name, struct ufs_dir_entry * de) | 34 | const unsigned char *name, struct ufs_dir_entry *de) |
| 35 | { | 35 | { |
| 36 | if (len != ufs_get_de_namlen(sb, de)) | 36 | if (len != ufs_get_de_namlen(sb, de)) |
| 37 | return 0; | 37 | return 0; |
| @@ -70,7 +70,7 @@ static inline unsigned long ufs_dir_pages(struct inode *inode) | |||
| 70 | return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT; | 70 | return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT; |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | ino_t ufs_inode_by_name(struct inode *dir, struct qstr *qstr) | 73 | ino_t ufs_inode_by_name(struct inode *dir, const struct qstr *qstr) |
| 74 | { | 74 | { |
| 75 | ino_t res = 0; | 75 | ino_t res = 0; |
| 76 | struct ufs_dir_entry *de; | 76 | struct ufs_dir_entry *de; |
| @@ -249,11 +249,11 @@ struct ufs_dir_entry *ufs_dotdot(struct inode *dir, struct page **p) | |||
| 249 | * (as a parameter - res_dir). Page is returned mapped and unlocked. | 249 | * (as a parameter - res_dir). Page is returned mapped and unlocked. |
| 250 | * Entry is guaranteed to be valid. | 250 | * Entry is guaranteed to be valid. |
| 251 | */ | 251 | */ |
| 252 | struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct qstr *qstr, | 252 | struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr, |
| 253 | struct page **res_page) | 253 | struct page **res_page) |
| 254 | { | 254 | { |
| 255 | struct super_block *sb = dir->i_sb; | 255 | struct super_block *sb = dir->i_sb; |
| 256 | const char *name = qstr->name; | 256 | const unsigned char *name = qstr->name; |
| 257 | int namelen = qstr->len; | 257 | int namelen = qstr->len; |
| 258 | unsigned reclen = UFS_DIR_REC_LEN(namelen); | 258 | unsigned reclen = UFS_DIR_REC_LEN(namelen); |
| 259 | unsigned long start, n; | 259 | unsigned long start, n; |
| @@ -313,7 +313,7 @@ found: | |||
| 313 | int ufs_add_link(struct dentry *dentry, struct inode *inode) | 313 | int ufs_add_link(struct dentry *dentry, struct inode *inode) |
| 314 | { | 314 | { |
| 315 | struct inode *dir = dentry->d_parent->d_inode; | 315 | struct inode *dir = dentry->d_parent->d_inode; |
| 316 | const char *name = dentry->d_name.name; | 316 | const unsigned char *name = dentry->d_name.name; |
| 317 | int namelen = dentry->d_name.len; | 317 | int namelen = dentry->d_name.len; |
| 318 | struct super_block *sb = dir->i_sb; | 318 | struct super_block *sb = dir->i_sb; |
| 319 | unsigned reclen = UFS_DIR_REC_LEN(namelen); | 319 | unsigned reclen = UFS_DIR_REC_LEN(namelen); |
