UDF: introduce struct extent_position

Introduce a structure extent_position to store a position of an extent and
the corresponding buffer_head in one place.

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, 13 insertions, 12 deletions

diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index 3c50b82a2307..00c15d3dd756 100644
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -111,12 +111,13 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d
         uint16_t liu;
         uint8_t lfi;
         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;
+        struct buffer_head *tmp, *bha[16];
+        kernel_lb_addr eloc;
+        uint32_t elen;
         sector_t offset;
         int i, num;
         unsigned int dt_type;
+        struct extent_position epos = { NULL, 0, {0, 0}};
 
         if (nf_pos >= size)
                 return 0;
@@ -128,22 +129,22 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d
         if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
                 fibh.sbh = fibh.ebh = NULL;
         else if (inode_bmap(dir, nf_pos >> (dir->i_sb->s_blocksize_bits - 2),
-                &bloc, &extoffset, &eloc, &elen, &offset, &bh) == (EXT_RECORDED_ALLOCATED >> 30))
+                &epos, &eloc, &elen, &offset) == (EXT_RECORDED_ALLOCATED >> 30))
         {
                 block = udf_get_lb_pblock(dir->i_sb, eloc, offset);
                 if ((++offset << dir->i_sb->s_blocksize_bits) < elen)
                 {
                         if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_SHORT)
-                                extoffset -= sizeof(short_ad);
+                                epos.offset -= sizeof(short_ad);
                         else if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_LONG)
-                                extoffset -= sizeof(long_ad);
+                                epos.offset -= sizeof(long_ad);
                 }
                 else
                         offset = 0;
 
                 if (!(fibh.sbh = fibh.ebh = udf_tread(dir->i_sb, block)))
                 {
-                        udf_release_data(bh);
+                        udf_release_data(epos.bh);
                         return -EIO;
                 }
         
@@ -171,7 +172,7 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d
         }
         else
         {
-                udf_release_data(bh);
+                udf_release_data(epos.bh);
                 return -ENOENT;
         }
 
@@ -179,14 +180,14 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d
         {
                 filp->f_pos = nf_pos + 1;
 
-                fi = udf_fileident_read(dir, &nf_pos, &fibh, &cfi, &bloc, &extoffset, &eloc, &elen, &offset, &bh);
+                fi = udf_fileident_read(dir, &nf_pos, &fibh, &cfi, &epos, &eloc, &elen, &offset);
 
                 if (!fi)
                 {
                         if (fibh.sbh != fibh.ebh)
                                 udf_release_data(fibh.ebh);
                         udf_release_data(fibh.sbh);
-                        udf_release_data(bh);
+                        udf_release_data(epos.bh);
                         return 0;
                 }
 
@@ -246,7 +247,7 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d
                                 if (fibh.sbh != fibh.ebh)
                                         udf_release_data(fibh.ebh);
                                 udf_release_data(fibh.sbh);
-                                udf_release_data(bh);
+                                udf_release_data(epos.bh);
                                 return 0;
                         }
                 }
@@ -257,7 +258,7 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d
         if (fibh.sbh != fibh.ebh)
                 udf_release_data(fibh.ebh);
         udf_release_data(fibh.sbh);
-        udf_release_data(bh);
+        udf_release_data(epos.bh);
 
         return 0;
 }