udf: use sector_t and loff_t for file offsets

Use sector_t and loff_t for file offsets in UDF filesystem.  Otherwise an
overflow may occur for long files.  Also make inode_bmap() return offset in
the extent in number of blocks instead of number of bytes - for most
callers this is more convenient.

Signed-off-by: Jan Kara <jack@suse.cz>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index 2391c9150c49..3c50b82a2307 100644
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -113,7 +113,8 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d
         loff_t size = (udf_ext0_offset(dir) + dir->i_size) >> 2;
         struct buffer_head * bh = NULL, * tmp, * bha[16];
         kernel_lb_addr bloc, eloc;
-        uint32_t extoffset, elen, offset;
+        uint32_t extoffset, elen;
+        sector_t offset;
         int i, num;
         unsigned int dt_type;
 
@@ -129,7 +130,6 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d
         else if (inode_bmap(dir, nf_pos >> (dir->i_sb->s_blocksize_bits - 2),
                 &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30))
         {
-                offset >>= dir->i_sb->s_blocksize_bits;
                 block = udf_get_lb_pblock(dir->i_sb, eloc, offset);
                 if ((++offset << dir->i_sb->s_blocksize_bits) < elen)
                 {