Commit cd31a496 authored by Linus Torvalds's avatar Linus Torvalds

Fix up UDF merge error

Andries made a declaration static, and this clashed with Al who
changed it for byteorder annotation. Fix it all up.
parent 58a618cf
...@@ -56,8 +56,8 @@ static int udf_update_inode(struct inode *, int); ...@@ -56,8 +56,8 @@ static int udf_update_inode(struct inode *, int);
static void udf_fill_inode(struct inode *, struct buffer_head *); static void udf_fill_inode(struct inode *, struct buffer_head *);
static struct buffer_head *inode_getblk(struct inode *, long, int *, static struct buffer_head *inode_getblk(struct inode *, long, int *,
long *, int *); long *, int *);
static int8_t udf_insert_aext(struct inode *, lb_addr, int, static int8_t udf_insert_aext(struct inode *, kernel_lb_addr, int,
lb_addr, uint32_t, struct buffer_head *); kernel_lb_addr, uint32_t, struct buffer_head *);
static void udf_split_extents(struct inode *, int *, int, int, static void udf_split_extents(struct inode *, int *, int, int,
kernel_long_ad [EXTENT_MERGE_SIZE], int *); kernel_long_ad [EXTENT_MERGE_SIZE], int *);
static void udf_prealloc_extents(struct inode *, int, int, static void udf_prealloc_extents(struct inode *, int, int,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment