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

Commit 391e8bbd authored by Al Viro's avatar Al Viro
Browse files

sanitize const/signedness for udf 



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

fs/udf/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static void udf_table_free_blocks(struct super_block *sb, 
		}



		if (epos.offset + (2 * adsize) > sb->s_blocksize) {

			char *sptr, *dptr;

			unsigned char *sptr, *dptr;

			int loffset;



			brelse(oepos.bh);

fs/udf/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ static int do_udf_readdir(struct inode *dir, struct file *filp, 
	int block, iblock;

	loff_t nf_pos = (filp->f_pos - 1) << 2;

	int flen;

	char *fname = NULL;

	char *nameptr;

	unsigned char *fname = NULL;

	unsigned char *nameptr;

	uint16_t liu;

	uint8_t lfi;

	loff_t size = udf_ext0_offset(dir) + dir->i_size;

fs/udf/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1672,7 +1672,7 @@ int8_t udf_add_aext(struct inode *inode, struct extent_position *epos, 
		return -1;



	if (epos->offset + (2 * adsize) > inode->i_sb->s_blocksize) {

		char *sptr, *dptr;

		unsigned char *sptr, *dptr;

		struct buffer_head *nbh;

		int err, loffset;

		struct kernel_lb_addr obloc = epos->block;

fs/udf/namei.c

+10 −10
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
#include <linux/crc-itu-t.h>

#include <linux/exportfs.h>



static inline int udf_match(int len1, const char *name1, int len2,

			    const char *name2)

static inline int udf_match(int len1, const unsigned char *name1, int len2,

			    const unsigned char *name2)

{

	if (len1 != len2)

		return 0;
@@ -142,15 +142,15 @@ int udf_write_fi(struct inode *inode, struct fileIdentDesc *cfi, 
}



static struct fileIdentDesc *udf_find_entry(struct inode *dir,

					    struct qstr *child,

					    const struct qstr *child,

					    struct udf_fileident_bh *fibh,

					    struct fileIdentDesc *cfi)

{

	struct fileIdentDesc *fi = NULL;

	loff_t f_pos;

	int block, flen;

	char *fname = NULL;

	char *nameptr;

	unsigned char *fname = NULL;

	unsigned char *nameptr;

	uint8_t lfi;

	uint16_t liu;

	loff_t size;
@@ -308,7 +308,7 @@ static struct fileIdentDesc *udf_add_entry(struct inode *dir, 
{

	struct super_block *sb = dir->i_sb;

	struct fileIdentDesc *fi = NULL;

	char *name = NULL;

	unsigned char *name = NULL;

	int namelen;

	loff_t f_pos;

	loff_t size = udf_ext0_offset(dir) + dir->i_size;
@@ -885,16 +885,16 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, 
{

	struct inode *inode;

	struct pathComponent *pc;

	char *compstart;

	const char *compstart;

	struct udf_fileident_bh fibh;

	struct extent_position epos = {};

	int eoffset, elen = 0;

	struct fileIdentDesc *fi;

	struct fileIdentDesc cfi;

	char *ea;

	uint8_t *ea;

	int err;

	int block;

	char *name = NULL;

	unsigned char *name = NULL;

	int namelen;

	struct buffer_head *bh;

	struct udf_inode_info *iinfo;
@@ -970,7 +970,7 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, 


		pc = (struct pathComponent *)(ea + elen);



		compstart = (char *)symname;

		compstart = symname;



		do {

			symname++;

fs/udf/symlink.c

+5 −5
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ 
#include <linux/buffer_head.h>

#include "udf_i.h"



static void udf_pc_to_char(struct super_block *sb, char *from, int fromlen,

			   char *to)

static void udf_pc_to_char(struct super_block *sb, unsigned char *from,

			   int fromlen, unsigned char *to)

{

	struct pathComponent *pc;

	int elen = 0;

	char *p = to;

	unsigned char *p = to;



	while (elen < fromlen) {

		pc = (struct pathComponent *)(from + elen);
@@ -75,9 +75,9 @@ static int udf_symlink_filler(struct file *file, struct page *page) 
{

	struct inode *inode = page->mapping->host;

	struct buffer_head *bh = NULL;

	char *symlink;

	unsigned char *symlink;

	int err = -EIO;

	char *p = kmap(page);

	unsigned char *p = kmap(page);

	struct udf_inode_info *iinfo;



	lock_kernel();