diff options
| -rw-r--r-- | fs/udf/inode.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 5f643c93f564..8d8eda8379ca 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
| @@ -57,14 +57,12 @@ static sector_t inode_getblk(struct inode *, sector_t, int *, int *); | |||
| 57 | static int8_t udf_insert_aext(struct inode *, struct extent_position, | 57 | static int8_t udf_insert_aext(struct inode *, struct extent_position, |
| 58 | struct kernel_lb_addr, uint32_t); | 58 | struct kernel_lb_addr, uint32_t); |
| 59 | static void udf_split_extents(struct inode *, int *, int, int, | 59 | static void udf_split_extents(struct inode *, int *, int, int, |
| 60 | struct kernel_long_ad[EXTENT_MERGE_SIZE], int *); | 60 | struct kernel_long_ad *, int *); |
| 61 | static void udf_prealloc_extents(struct inode *, int, int, | 61 | static void udf_prealloc_extents(struct inode *, int, int, |
| 62 | struct kernel_long_ad[EXTENT_MERGE_SIZE], int *); | 62 | struct kernel_long_ad *, int *); |
| 63 | static void udf_merge_extents(struct inode *, | 63 | static void udf_merge_extents(struct inode *, struct kernel_long_ad *, int *); |
| 64 | struct kernel_long_ad[EXTENT_MERGE_SIZE], int *); | 64 | static void udf_update_extents(struct inode *, struct kernel_long_ad *, int, |
| 65 | static void udf_update_extents(struct inode *, | 65 | int, struct extent_position *); |
| 66 | struct kernel_long_ad[EXTENT_MERGE_SIZE], int, int, | ||
| 67 | struct extent_position *); | ||
| 68 | static int udf_get_block(struct inode *, sector_t, struct buffer_head *, int); | 66 | static int udf_get_block(struct inode *, sector_t, struct buffer_head *, int); |
| 69 | 67 | ||
| 70 | static void __udf_clear_extent_cache(struct inode *inode) | 68 | static void __udf_clear_extent_cache(struct inode *inode) |
| @@ -896,8 +894,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, | |||
| 896 | } | 894 | } |
| 897 | 895 | ||
| 898 | static void udf_split_extents(struct inode *inode, int *c, int offset, | 896 | static void udf_split_extents(struct inode *inode, int *c, int offset, |
| 899 | int newblocknum, | 897 | int newblocknum, struct kernel_long_ad *laarr, |
| 900 | struct kernel_long_ad laarr[EXTENT_MERGE_SIZE], | ||
| 901 | int *endnum) | 898 | int *endnum) |
| 902 | { | 899 | { |
| 903 | unsigned long blocksize = inode->i_sb->s_blocksize; | 900 | unsigned long blocksize = inode->i_sb->s_blocksize; |
| @@ -961,7 +958,7 @@ static void udf_split_extents(struct inode *inode, int *c, int offset, | |||
| 961 | } | 958 | } |
| 962 | 959 | ||
| 963 | static void udf_prealloc_extents(struct inode *inode, int c, int lastblock, | 960 | static void udf_prealloc_extents(struct inode *inode, int c, int lastblock, |
| 964 | struct kernel_long_ad laarr[EXTENT_MERGE_SIZE], | 961 | struct kernel_long_ad *laarr, |
| 965 | int *endnum) | 962 | int *endnum) |
| 966 | { | 963 | { |
| 967 | int start, length = 0, currlength = 0, i; | 964 | int start, length = 0, currlength = 0, i; |
| @@ -1056,8 +1053,7 @@ static void udf_prealloc_extents(struct inode *inode, int c, int lastblock, | |||
| 1056 | } | 1053 | } |
| 1057 | } | 1054 | } |
| 1058 | 1055 | ||
| 1059 | static void udf_merge_extents(struct inode *inode, | 1056 | static void udf_merge_extents(struct inode *inode, struct kernel_long_ad *laarr, |
| 1060 | struct kernel_long_ad laarr[EXTENT_MERGE_SIZE], | ||
| 1061 | int *endnum) | 1057 | int *endnum) |
| 1062 | { | 1058 | { |
| 1063 | int i; | 1059 | int i; |
| @@ -1156,8 +1152,7 @@ static void udf_merge_extents(struct inode *inode, | |||
| 1156 | } | 1152 | } |
| 1157 | } | 1153 | } |
| 1158 | 1154 | ||
| 1159 | static void udf_update_extents(struct inode *inode, | 1155 | static void udf_update_extents(struct inode *inode, struct kernel_long_ad *laarr, |
| 1160 | struct kernel_long_ad laarr[EXTENT_MERGE_SIZE], | ||
| 1161 | int startnum, int endnum, | 1156 | int startnum, int endnum, |
| 1162 | struct extent_position *epos) | 1157 | struct extent_position *epos) |
| 1163 | { | 1158 | { |
