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

Commit 6c1e4d06 authored by Jan Kara's avatar Jan Kara
Browse files

udf: Drop unused arguments of udf_delete_aext() 



udf_delete_aext() uses its last two arguments only as local variables.
Drop them.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent f2e83347

fs/udf/balloc.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -533,8 +533,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb, 
			udf_write_aext(table, &epos, &eloc,

			udf_write_aext(table, &epos, &eloc,

					(etype << 30) | elen, 1);

					(etype << 30) | elen, 1);

		} else

		} else

			udf_delete_aext(table, epos, eloc,

			udf_delete_aext(table, epos);

					(etype << 30) | elen);

	} else {

	} else {

		alloc_count = 0;

		alloc_count = 0;

	}

	}
@@ -630,7 +629,7 @@ static udf_pblk_t udf_table_new_block(struct super_block *sb, 
	if (goal_elen)

	if (goal_elen)

		udf_write_aext(table, &goal_epos, &goal_eloc, goal_elen, 1);

		udf_write_aext(table, &goal_epos, &goal_eloc, goal_elen, 1);

	else

	else

		udf_delete_aext(table, goal_epos, goal_eloc, goal_elen);

		udf_delete_aext(table, goal_epos);

	brelse(goal_epos.bh);

	brelse(goal_epos.bh);





	udf_add_free_space(sb, partition, -1);

	udf_add_free_space(sb, partition, -1);

fs/udf/inode.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1147,8 +1147,7 @@ static void udf_update_extents(struct inode *inode, struct kernel_long_ad *laarr 




	if (startnum > endnum) {

	if (startnum > endnum) {

		for (i = 0; i < (startnum - endnum); i++)

		for (i = 0; i < (startnum - endnum); i++)

			udf_delete_aext(inode, *epos, laarr[i].extLocation,

			udf_delete_aext(inode, *epos);

					laarr[i].extLength);

	} else if (startnum < endnum) {

	} else if (startnum < endnum) {

		for (i = 0; i < (endnum - startnum); i++) {

		for (i = 0; i < (endnum - startnum); i++) {

			udf_insert_aext(inode, *epos, laarr[i].extLocation,

			udf_insert_aext(inode, *epos, laarr[i].extLocation,
@@ -2176,14 +2175,15 @@ static int8_t udf_insert_aext(struct inode *inode, struct extent_position epos, 
	return (nelen >> 30);

	return (nelen >> 30);

}

}





int8_t udf_delete_aext(struct inode *inode, struct extent_position epos,

int8_t udf_delete_aext(struct inode *inode, struct extent_position epos)

		       struct kernel_lb_addr eloc, uint32_t elen)

{

{

	struct extent_position oepos;

	struct extent_position oepos;

	int adsize;

	int adsize;

	int8_t etype;

	int8_t etype;

	struct allocExtDesc *aed;

	struct allocExtDesc *aed;

	struct udf_inode_info *iinfo;

	struct udf_inode_info *iinfo;

	struct kernel_lb_addr eloc;

	uint32_t elen;





	if (epos.bh) {

	if (epos.bh) {

		get_bh(epos.bh);

		get_bh(epos.bh);

fs/udf/udfdecl.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -173,8 +173,7 @@ extern int udf_add_aext(struct inode *, struct extent_position *, 
			struct kernel_lb_addr *, uint32_t, int);

			struct kernel_lb_addr *, uint32_t, int);

extern void udf_write_aext(struct inode *, struct extent_position *,

extern void udf_write_aext(struct inode *, struct extent_position *,

			   struct kernel_lb_addr *, uint32_t, int);

			   struct kernel_lb_addr *, uint32_t, int);

extern int8_t udf_delete_aext(struct inode *, struct extent_position,

extern int8_t udf_delete_aext(struct inode *, struct extent_position);

			      struct kernel_lb_addr, uint32_t);

extern int8_t udf_next_aext(struct inode *, struct extent_position *,

extern int8_t udf_next_aext(struct inode *, struct extent_position *,

			    struct kernel_lb_addr *, uint32_t *, int);

			    struct kernel_lb_addr *, uint32_t *, int);

extern int8_t udf_current_aext(struct inode *, struct extent_position *,

extern int8_t udf_current_aext(struct inode *, struct extent_position *,