1 files changed, 59 insertions, 43 deletions

diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index ff8c08fd7bf5..2820f8fcf4cc 100644
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -19,7 +19,7 @@
 #include <linux/buffer_head.h>
 
 #if 0
-static uint8_t *udf_filead_read(struct inode *dir, uint8_t * tmpad,
+static uint8_t *udf_filead_read(struct inode *dir, uint8_t *tmpad,
                                 uint8_t ad_size, kernel_lb_addr fe_loc,
                                 int *pos, int *offset, struct buffer_head **bh,
                                 int *error)
@@ -45,7 +45,8 @@ static uint8_t *udf_filead_read(struct inode *dir, uint8_t * tmpad,
                 block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
                 if (!block)
                         return NULL;
-                if (!(*bh = udf_tread(dir->i_sb, block)))
+                *bh = udf_tread(dir->i_sb, block);
+                if (!*bh)
                         return NULL;
         } else if (*offset > dir->i_sb->s_blocksize) {
                 ad = tmpad;
@@ -57,10 +58,12 @@ static uint8_t *udf_filead_read(struct inode *dir, uint8_t * tmpad,
                 block = udf_get_lb_pblock(dir->i_sb, fe_loc, ++*pos);
                 if (!block)
                         return NULL;
-                if (!((*bh) = udf_tread(dir->i_sb, block)))
+                (*bh) = udf_tread(dir->i_sb, block);
+                if (!*bh)
                         return NULL;
 
-                memcpy((uint8_t *)ad + remainder, (*bh)->b_data, ad_size - remainder);
+                memcpy((uint8_t *)ad + remainder, (*bh)->b_data,
+                        ad_size - remainder);
                 *offset = ad_size - remainder;
         }
 
@@ -68,29 +71,31 @@ static uint8_t *udf_filead_read(struct inode *dir, uint8_t * tmpad,
 }
 #endif
 
-struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t * nf_pos,
+struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                                          struct udf_fileident_bh *fibh,
                                          struct fileIdentDesc *cfi,
                                          struct extent_position *epos,
-                                         kernel_lb_addr * eloc, uint32_t * elen,
-                                         sector_t * offset)
+                                         kernel_lb_addr *eloc, uint32_t *elen,
+                                         sector_t *offset)
 {
         struct fileIdentDesc *fi;
         int i, num, block;
         struct buffer_head *tmp, *bha[16];
+        struct udf_inode_info *iinfo = UDF_I(dir);
 
         fibh->soffset = fibh->eoffset;
 
-        if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB) {
-                fi = udf_get_fileident(UDF_I_DATA(dir) -
-                                       (UDF_I_EFE(dir) ?
+        if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
+                fi = udf_get_fileident(iinfo->i_ext.i_data -
+                                       (iinfo->i_efe ?
                                         sizeof(struct extendedFileEntry) :
                                         sizeof(struct fileEntry)),
-                                       dir->i_sb->s_blocksize, &(fibh->eoffset));
+                                       dir->i_sb->s_blocksize,
+                                       &(fibh->eoffset));
                 if (!fi)
                         return NULL;
 
-                *nf_pos += ((fibh->eoffset - fibh->soffset) >> 2);
+                *nf_pos += fibh->eoffset - fibh->soffset;
 
                 memcpy((uint8_t *)cfi, (uint8_t *)fi,
                        sizeof(struct fileIdentDesc));
@@ -100,6 +105,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t * nf_pos,
 
         if (fibh->eoffset == dir->i_sb->s_blocksize) {
                 int lextoffset = epos->offset;
+                unsigned char blocksize_bits = dir->i_sb->s_blocksize_bits;
 
                 if (udf_next_aext(dir, epos, eloc, elen, 1) !=
                     (EXT_RECORDED_ALLOCATED >> 30))
@@ -109,24 +115,27 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t * nf_pos,
 
                 (*offset)++;
 
-                if ((*offset << dir->i_sb->s_blocksize_bits) >= *elen)
+                if ((*offset << blocksize_bits) >= *elen)
                         *offset = 0;
                 else
                         epos->offset = lextoffset;
 
                 brelse(fibh->sbh);
-                if (!(fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block)))
+                fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block);
+                if (!fibh->sbh)
                         return NULL;
                 fibh->soffset = fibh->eoffset = 0;
 
-                if (!(*offset & ((16 >> (dir->i_sb->s_blocksize_bits - 9)) - 1))) {
-                        i = 16 >> (dir->i_sb->s_blocksize_bits - 9);
-                        if (i + *offset > (*elen >> dir->i_sb->s_blocksize_bits))
-                                i = (*elen >> dir->i_sb->s_blocksize_bits)-*offset;
+                if (!(*offset & ((16 >> (blocksize_bits - 9)) - 1))) {
+                        i = 16 >> (blocksize_bits - 9);
+                        if (i + *offset > (*elen >> blocksize_bits))
+                                i = (*elen >> blocksize_bits)-*offset;
                         for (num = 0; i > 0; i--) {
-                                block = udf_get_lb_pblock(dir->i_sb, *eloc, *offset + i);
+                                block = udf_get_lb_pblock(dir->i_sb, *eloc,
+                                                          *offset + i);
                                 tmp = udf_tgetblk(dir->i_sb, block);
-                                if (tmp && !buffer_uptodate(tmp) && !buffer_locked(tmp))
+                                if (tmp && !buffer_uptodate(tmp) &&
+                                                !buffer_locked(tmp))
                                         bha[num++] = tmp;
                                 else
                                         brelse(tmp);
@@ -148,7 +157,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t * nf_pos,
         if (!fi)
                 return NULL;
 
-        *nf_pos += ((fibh->eoffset - fibh->soffset) >> 2);
+        *nf_pos += fibh->eoffset - fibh->soffset;
 
         if (fibh->eoffset <= dir->i_sb->s_blocksize) {
                 memcpy((uint8_t *)cfi, (uint8_t *)fi,
@@ -172,20 +181,23 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t * nf_pos,
                 fibh->soffset -= dir->i_sb->s_blocksize;
                 fibh->eoffset -= dir->i_sb->s_blocksize;
 
-                if (!(fibh->ebh = udf_tread(dir->i_sb, block)))
+                fibh->ebh = udf_tread(dir->i_sb, block);
+                if (!fibh->ebh)
                         return NULL;
 
                 if (sizeof(struct fileIdentDesc) > -fibh->soffset) {
                         int fi_len;
 
                         memcpy((uint8_t *)cfi, (uint8_t *)fi, -fibh->soffset);
-                        memcpy((uint8_t *)cfi - fibh->soffset, fibh->ebh->b_data,
+                        memcpy((uint8_t *)cfi - fibh->soffset,
+                               fibh->ebh->b_data,
                                sizeof(struct fileIdentDesc) + fibh->soffset);
 
-                        fi_len = (sizeof(struct fileIdentDesc) + cfi->lengthFileIdent +
+                        fi_len = (sizeof(struct fileIdentDesc) +
+                                  cfi->lengthFileIdent +
                                   le16_to_cpu(cfi->lengthOfImpUse) + 3) & ~3;
 
-                        *nf_pos += ((fi_len - (fibh->eoffset - fibh->soffset)) >> 2);
+                        *nf_pos += fi_len - (fibh->eoffset - fibh->soffset);
                         fibh->eoffset = fibh->soffset + fi_len;
                 } else {
                         memcpy((uint8_t *)cfi, (uint8_t *)fi,
@@ -210,11 +222,10 @@ struct fileIdentDesc *udf_get_fileident(void *buffer, int bufsize, int *offset)
 
         ptr = buffer;
 
-        if ((*offset > 0) && (*offset < bufsize)) {
+        if ((*offset > 0) && (*offset < bufsize))
                 ptr += *offset;
-        }
         fi = (struct fileIdentDesc *)ptr;
-        if (le16_to_cpu(fi->descTag.tagIdent) != TAG_IDENT_FID) {
+        if (fi->descTag.tagIdent != cpu_to_le16(TAG_IDENT_FID)) {
                 udf_debug("0x%x != TAG_IDENT_FID\n",
                           le16_to_cpu(fi->descTag.tagIdent));
                 udf_debug("offset: %u sizeof: %lu bufsize: %u\n",
@@ -222,12 +233,11 @@ struct fileIdentDesc *udf_get_fileident(void *buffer, int bufsize, int *offset)
                           bufsize);
                 return NULL;
         }
-        if ((*offset + sizeof(struct fileIdentDesc)) > bufsize) {
+        if ((*offset + sizeof(struct fileIdentDesc)) > bufsize)
                 lengthThisIdent = sizeof(struct fileIdentDesc);
-        } else {
+        else
                 lengthThisIdent = sizeof(struct fileIdentDesc) +
                         fi->lengthFileIdent + le16_to_cpu(fi->lengthOfImpUse);
-        }
 
         /* we need to figure padding, too! */
         padlen = lengthThisIdent % UDF_NAME_PAD;
@@ -252,17 +262,17 @@ static extent_ad *udf_get_fileextent(void *buffer, int bufsize, int *offset)
 
         fe = (struct fileEntry *)buffer;
 
-        if (le16_to_cpu(fe->descTag.tagIdent) != TAG_IDENT_FE) {
+        if (fe->descTag.tagIdent != cpu_to_le16(TAG_IDENT_FE)) {
                 udf_debug("0x%x != TAG_IDENT_FE\n",
                           le16_to_cpu(fe->descTag.tagIdent));
                 return NULL;
         }
 
-        ptr = (uint8_t *)(fe->extendedAttr) + le32_to_cpu(fe->lengthExtendedAttr);
+        ptr = (uint8_t *)(fe->extendedAttr) +
+                le32_to_cpu(fe->lengthExtendedAttr);
 
-        if ((*offset > 0) && (*offset < le32_to_cpu(fe->lengthAllocDescs))) {
+        if ((*offset > 0) && (*offset < le32_to_cpu(fe->lengthAllocDescs)))
                 ptr += *offset;
-        }
 
         ext = (extent_ad *)ptr;
 
@@ -271,7 +281,7 @@ static extent_ad *udf_get_fileextent(void *buffer, int bufsize, int *offset)
 }
 #endif
 
-short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, int *offset,
+short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, uint32_t *offset,
                               int inc)
 {
         short_ad *sa;
@@ -281,17 +291,20 @@ short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, int *offset,
                 return NULL;
         }
 
-        if ((*offset < 0) || ((*offset + sizeof(short_ad)) > maxoffset))
-                return NULL;
-        else if ((sa = (short_ad *)ptr)->extLength == 0)
+        if ((*offset + sizeof(short_ad)) > maxoffset)
                 return NULL;
+        else {
+                sa = (short_ad *)ptr;
+                if (sa->extLength == 0)
+                        return NULL;
+        }
 
         if (inc)
                 *offset += sizeof(short_ad);
         return sa;
 }
 
-long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, int *offset, int inc)
+long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, uint32_t *offset, int inc)
 {
         long_ad *la;
 
@@ -300,10 +313,13 @@ long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, int *offset, int inc)
                 return NULL;
         }
 
-        if ((*offset < 0) || ((*offset + sizeof(long_ad)) > maxoffset))
-                return NULL;
-        else if ((la = (long_ad *)ptr)->extLength == 0)
+        if ((*offset + sizeof(long_ad)) > maxoffset)
                 return NULL;
+        else {
+                la = (long_ad *)ptr;
+                if (la->extLength == 0)
+                        return NULL;
+        }
 
         if (inc)
                 *offset += sizeof(long_ad);