aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/udf/directory.c8
-rw-r--r--fs/udf/inode.c6
-rw-r--r--fs/udf/udfdecl.h4
3 files changed, 9 insertions, 9 deletions
diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index d8ceb44f4f22..be16d7698a8c 100644
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -282,7 +282,7 @@ static extent_ad *udf_get_fileextent(void *buffer, int bufsize, int *offset)
282} 282}
283#endif 283#endif
284 284
285short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, int *offset, 285short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, uint32_t *offset,
286 int inc) 286 int inc)
287{ 287{
288 short_ad *sa; 288 short_ad *sa;
@@ -292,7 +292,7 @@ short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, int *offset,
292 return NULL; 292 return NULL;
293 } 293 }
294 294
295 if ((*offset < 0) || ((*offset + sizeof(short_ad)) > maxoffset)) 295 if ((*offset + sizeof(short_ad)) > maxoffset)
296 return NULL; 296 return NULL;
297 else { 297 else {
298 sa = (short_ad *)ptr; 298 sa = (short_ad *)ptr;
@@ -305,7 +305,7 @@ short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, int *offset,
305 return sa; 305 return sa;
306} 306}
307 307
308long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, int *offset, int inc) 308long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, uint32_t *offset, int inc)
309{ 309{
310 long_ad *la; 310 long_ad *la;
311 311
@@ -314,7 +314,7 @@ long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, int *offset, int inc)
314 return NULL; 314 return NULL;
315 } 315 }
316 316
317 if ((*offset < 0) || ((*offset + sizeof(long_ad)) > maxoffset)) 317 if ((*offset + sizeof(long_ad)) > maxoffset)
318 return NULL; 318 return NULL;
319 else { 319 else {
320 la = (long_ad *)ptr; 320 la = (long_ad *)ptr;
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 6b4409f50196..466d2eea0eca 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -52,7 +52,7 @@ static int udf_update_inode(struct inode *, int);
52static void udf_fill_inode(struct inode *, struct buffer_head *); 52static void udf_fill_inode(struct inode *, struct buffer_head *);
53static int udf_alloc_i_data(struct inode *inode, size_t size); 53static int udf_alloc_i_data(struct inode *inode, size_t size);
54static struct buffer_head *inode_getblk(struct inode *, sector_t, int *, 54static struct buffer_head *inode_getblk(struct inode *, sector_t, int *,
55 long *, int *); 55 sector_t *, int *);
56static int8_t udf_insert_aext(struct inode *, struct extent_position, 56static int8_t udf_insert_aext(struct inode *, struct extent_position,
57 kernel_lb_addr, uint32_t); 57 kernel_lb_addr, uint32_t);
58static void udf_split_extents(struct inode *, int *, int, int, 58static void udf_split_extents(struct inode *, int *, int, int,
@@ -307,7 +307,7 @@ static int udf_get_block(struct inode *inode, sector_t block,
307{ 307{
308 int err, new; 308 int err, new;
309 struct buffer_head *bh; 309 struct buffer_head *bh;
310 unsigned long phys; 310 sector_t phys = 0;
311 struct udf_inode_info *iinfo; 311 struct udf_inode_info *iinfo;
312 312
313 if (!create) { 313 if (!create) {
@@ -489,7 +489,7 @@ out:
489} 489}
490 490
491static struct buffer_head *inode_getblk(struct inode *inode, sector_t block, 491static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
492 int *err, long *phys, int *new) 492 int *err, sector_t *phys, int *new)
493{ 493{
494 static sector_t last_block; 494 static sector_t last_block;
495 struct buffer_head *result = NULL; 495 struct buffer_head *result = NULL;
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index d9b8e281b95b..681dc2b66cdb 100644
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -188,8 +188,8 @@ extern struct fileIdentDesc *udf_fileident_read(struct inode *, loff_t *,
188 sector_t *); 188 sector_t *);
189extern struct fileIdentDesc *udf_get_fileident(void *buffer, int bufsize, 189extern struct fileIdentDesc *udf_get_fileident(void *buffer, int bufsize,
190 int *offset); 190 int *offset);
191extern long_ad *udf_get_filelongad(uint8_t *, int, int *, int); 191extern long_ad *udf_get_filelongad(uint8_t *, int, uint32_t *, int);
192extern short_ad *udf_get_fileshortad(uint8_t *, int, int *, int); 192extern short_ad *udf_get_fileshortad(uint8_t *, int, uint32_t *, int);
193 193
194/* crc.c */ 194/* crc.c */
195extern uint16_t udf_crc(uint8_t *, uint32_t, uint16_t); 195extern uint16_t udf_crc(uint8_t *, uint32_t, uint16_t);