diff options
author | Jan Kara <jack@suse.cz> | 2018-06-13 12:04:24 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2018-06-20 05:05:49 -0400 |
commit | 6c1e4d06a3808dc67dbce2d631f4c12574567dd5 (patch) | |
tree | bab68d508957807001113b27c516d7b760ce2fce /fs/udf | |
parent | f2e83347119acc0412941c5a23d895624c9300e2 (diff) |
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: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
-rw-r--r-- | fs/udf/balloc.c | 5 | ||||
-rw-r--r-- | fs/udf/inode.c | 8 | ||||
-rw-r--r-- | fs/udf/udfdecl.h | 3 |
3 files changed, 7 insertions, 9 deletions
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index 1b961b1d9699..fcda0fc97b90 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c | |||
@@ -533,8 +533,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb, | |||
533 | udf_write_aext(table, &epos, &eloc, | 533 | udf_write_aext(table, &epos, &eloc, |
534 | (etype << 30) | elen, 1); | 534 | (etype << 30) | elen, 1); |
535 | } else | 535 | } else |
536 | udf_delete_aext(table, epos, eloc, | 536 | udf_delete_aext(table, epos); |
537 | (etype << 30) | elen); | ||
538 | } else { | 537 | } else { |
539 | alloc_count = 0; | 538 | alloc_count = 0; |
540 | } | 539 | } |
@@ -630,7 +629,7 @@ static udf_pblk_t udf_table_new_block(struct super_block *sb, | |||
630 | if (goal_elen) | 629 | if (goal_elen) |
631 | udf_write_aext(table, &goal_epos, &goal_eloc, goal_elen, 1); | 630 | udf_write_aext(table, &goal_epos, &goal_eloc, goal_elen, 1); |
632 | else | 631 | else |
633 | udf_delete_aext(table, goal_epos, goal_eloc, goal_elen); | 632 | udf_delete_aext(table, goal_epos); |
634 | brelse(goal_epos.bh); | 633 | brelse(goal_epos.bh); |
635 | 634 | ||
636 | udf_add_free_space(sb, partition, -1); | 635 | udf_add_free_space(sb, partition, -1); |
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 7f39d17352c9..9915a58fbabd 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
@@ -1147,8 +1147,7 @@ static void udf_update_extents(struct inode *inode, struct kernel_long_ad *laarr | |||
1147 | 1147 | ||
1148 | if (startnum > endnum) { | 1148 | if (startnum > endnum) { |
1149 | for (i = 0; i < (startnum - endnum); i++) | 1149 | for (i = 0; i < (startnum - endnum); i++) |
1150 | udf_delete_aext(inode, *epos, laarr[i].extLocation, | 1150 | udf_delete_aext(inode, *epos); |
1151 | laarr[i].extLength); | ||
1152 | } else if (startnum < endnum) { | 1151 | } else if (startnum < endnum) { |
1153 | for (i = 0; i < (endnum - startnum); i++) { | 1152 | for (i = 0; i < (endnum - startnum); i++) { |
1154 | udf_insert_aext(inode, *epos, laarr[i].extLocation, | 1153 | 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, | |||
2176 | return (nelen >> 30); | 2175 | return (nelen >> 30); |
2177 | } | 2176 | } |
2178 | 2177 | ||
2179 | int8_t udf_delete_aext(struct inode *inode, struct extent_position epos, | 2178 | int8_t udf_delete_aext(struct inode *inode, struct extent_position epos) |
2180 | struct kernel_lb_addr eloc, uint32_t elen) | ||
2181 | { | 2179 | { |
2182 | struct extent_position oepos; | 2180 | struct extent_position oepos; |
2183 | int adsize; | 2181 | int adsize; |
2184 | int8_t etype; | 2182 | int8_t etype; |
2185 | struct allocExtDesc *aed; | 2183 | struct allocExtDesc *aed; |
2186 | struct udf_inode_info *iinfo; | 2184 | struct udf_inode_info *iinfo; |
2185 | struct kernel_lb_addr eloc; | ||
2186 | uint32_t elen; | ||
2187 | 2187 | ||
2188 | if (epos.bh) { | 2188 | if (epos.bh) { |
2189 | get_bh(epos.bh); | 2189 | get_bh(epos.bh); |
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index ed890bc4416d..84c47dde4d26 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h | |||
@@ -173,8 +173,7 @@ extern int udf_add_aext(struct inode *, struct extent_position *, | |||
173 | struct kernel_lb_addr *, uint32_t, int); | 173 | struct kernel_lb_addr *, uint32_t, int); |
174 | extern void udf_write_aext(struct inode *, struct extent_position *, | 174 | extern void udf_write_aext(struct inode *, struct extent_position *, |
175 | struct kernel_lb_addr *, uint32_t, int); | 175 | struct kernel_lb_addr *, uint32_t, int); |
176 | extern int8_t udf_delete_aext(struct inode *, struct extent_position, | 176 | extern int8_t udf_delete_aext(struct inode *, struct extent_position); |
177 | struct kernel_lb_addr, uint32_t); | ||
178 | extern int8_t udf_next_aext(struct inode *, struct extent_position *, | 177 | extern int8_t udf_next_aext(struct inode *, struct extent_position *, |
179 | struct kernel_lb_addr *, uint32_t *, int); | 178 | struct kernel_lb_addr *, uint32_t *, int); |
180 | extern int8_t udf_current_aext(struct inode *, struct extent_position *, | 179 | extern int8_t udf_current_aext(struct inode *, struct extent_position *, |