Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89031bc7 authored by Al Viro's avatar Al Viro
Browse files

sanitize const/signedness of ufs a bit 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 7e7742ee

fs/ufs/dir.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ 
 * len <= UFS_MAXNAMLEN and de != NULL are guaranteed by caller.

 * len <= UFS_MAXNAMLEN and de != NULL are guaranteed by caller.

 */

 */

static inline int ufs_match(struct super_block *sb, int len,

static inline int ufs_match(struct super_block *sb, int len,

		const char * const name, struct ufs_dir_entry * de)

		const unsigned char *name, struct ufs_dir_entry *de)

{

{

	if (len != ufs_get_de_namlen(sb, de))

	if (len != ufs_get_de_namlen(sb, de))

		return 0;

		return 0;
@@ -70,7 +70,7 @@ static inline unsigned long ufs_dir_pages(struct inode *inode) 
	return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT;

	return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT;

}

}





ino_t ufs_inode_by_name(struct inode *dir, struct qstr *qstr)

ino_t ufs_inode_by_name(struct inode *dir, const struct qstr *qstr)

{

{

	ino_t res = 0;

	ino_t res = 0;

	struct ufs_dir_entry *de;

	struct ufs_dir_entry *de;
@@ -249,11 +249,11 @@ struct ufs_dir_entry *ufs_dotdot(struct inode *dir, struct page **p) 
 * (as a parameter - res_dir). Page is returned mapped and unlocked.

 * (as a parameter - res_dir). Page is returned mapped and unlocked.

 * Entry is guaranteed to be valid.

 * Entry is guaranteed to be valid.

 */

 */

struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct qstr *qstr,

struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr,

				     struct page **res_page)

				     struct page **res_page)

{

{

	struct super_block *sb = dir->i_sb;

	struct super_block *sb = dir->i_sb;

	const char *name = qstr->name;

	const unsigned char *name = qstr->name;

	int namelen = qstr->len;

	int namelen = qstr->len;

	unsigned reclen = UFS_DIR_REC_LEN(namelen);

	unsigned reclen = UFS_DIR_REC_LEN(namelen);

	unsigned long start, n;

	unsigned long start, n;
@@ -313,7 +313,7 @@ found: 
int ufs_add_link(struct dentry *dentry, struct inode *inode)

int ufs_add_link(struct dentry *dentry, struct inode *inode)

{

{

	struct inode *dir = dentry->d_parent->d_inode;

	struct inode *dir = dentry->d_parent->d_inode;

	const char *name = dentry->d_name.name;

	const unsigned char *name = dentry->d_name.name;

	int namelen = dentry->d_name.len;

	int namelen = dentry->d_name.len;

	struct super_block *sb = dir->i_sb;

	struct super_block *sb = dir->i_sb;

	unsigned reclen = UFS_DIR_REC_LEN(namelen);

	unsigned reclen = UFS_DIR_REC_LEN(namelen);

fs/ufs/ufs.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -86,9 +86,9 @@ extern void ufs_put_cylinder (struct super_block *, unsigned); 
/* dir.c */

/* dir.c */

extern const struct inode_operations ufs_dir_inode_operations;

extern const struct inode_operations ufs_dir_inode_operations;

extern int ufs_add_link (struct dentry *, struct inode *);

extern int ufs_add_link (struct dentry *, struct inode *);

extern ino_t ufs_inode_by_name(struct inode *, struct qstr *);

extern ino_t ufs_inode_by_name(struct inode *, const struct qstr *);

extern int ufs_make_empty(struct inode *, struct inode *);

extern int ufs_make_empty(struct inode *, struct inode *);

extern struct ufs_dir_entry *ufs_find_entry(struct inode *, struct qstr *, struct page **);

extern struct ufs_dir_entry *ufs_find_entry(struct inode *, const struct qstr *, struct page **);

extern int ufs_delete_entry(struct inode *, struct ufs_dir_entry *, struct page *);

extern int ufs_delete_entry(struct inode *, struct ufs_dir_entry *, struct page *);

extern int ufs_empty_dir (struct inode *);

extern int ufs_empty_dir (struct inode *);

extern struct ufs_dir_entry *ufs_dotdot(struct inode *, struct page **);

extern struct ufs_dir_entry *ufs_dotdot(struct inode *, struct page **);