UDF: coding style conversion - lindent

This patch converts UDF coding style to kernel coding style using Lindent.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 345 insertions, 375 deletions

diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index 51fe307dc0ec..334d363a0903 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -32,7 +32,8 @@
 #include <linux/buffer_head.h>
 #include <linux/sched.h>
 
-static inline int udf_match(int len1, const char *name1, int len2, const char *name2)
+static inline int udf_match(int len1, const char *name1, int len2,
+                            const char *name2)
 {
         if (len1 != len2)
                 return 0;
@@ -40,8 +41,8 @@ static inline int udf_match(int len1, const char *name1, int len2, const char *n
 }
 
 int udf_write_fi(struct inode *inode, struct fileIdentDesc *cfi,
-        struct fileIdentDesc *sfi, struct udf_fileident_bh *fibh,
-        uint8_t *impuse, uint8_t *fileident)
+                 struct fileIdentDesc *sfi, struct udf_fileident_bh *fibh,
+                 uint8_t * impuse, uint8_t * fileident)
 {
         uint16_t crclen = fibh->eoffset - fibh->soffset - sizeof(tag);
         uint16_t crc;
@@ -51,7 +52,7 @@ int udf_write_fi(struct inode *inode, struct fileIdentDesc *cfi,
         uint16_t liu = le16_to_cpu(cfi->lengthOfImpUse);
         uint8_t lfi = cfi->lengthFileIdent;
         int padlen = fibh->eoffset - fibh->soffset - liu - lfi -
-                sizeof(struct fileIdentDesc);
+            sizeof(struct fileIdentDesc);
         int adinicb = 0;
 
         if (UDF_I_ALLOCTYPE(inode) == ICBTAG_FLAG_AD_IN_ICB)
@@ -59,83 +60,86 @@ int udf_write_fi(struct inode *inode, struct fileIdentDesc *cfi,
 
         offset = fibh->soffset + sizeof(struct fileIdentDesc);
 
-        if (impuse)
-        {
+        if (impuse) {
                 if (adinicb || (offset + liu < 0))
-                        memcpy((uint8_t *)sfi->impUse, impuse, liu);
+                        memcpy((uint8_t *) sfi->impUse, impuse, liu);
                 else if (offset >= 0)
                         memcpy(fibh->ebh->b_data + offset, impuse, liu);
-                else
-                {
-                        memcpy((uint8_t *)sfi->impUse, impuse, -offset);
-                        memcpy(fibh->ebh->b_data, impuse - offset, liu + offset);
+                else {
+                        memcpy((uint8_t *) sfi->impUse, impuse, -offset);
+                        memcpy(fibh->ebh->b_data, impuse - offset,
+                               liu + offset);
                 }
         }
 
         offset += liu;
 
-        if (fileident)
-        {
+        if (fileident) {
                 if (adinicb || (offset + lfi < 0))
-                        memcpy((uint8_t *)sfi->fileIdent + liu, fileident, lfi);
+                        memcpy((uint8_t *) sfi->fileIdent + liu, fileident,
+                               lfi);
                 else if (offset >= 0)
                         memcpy(fibh->ebh->b_data + offset, fileident, lfi);
-                else
-                {
-                        memcpy((uint8_t *)sfi->fileIdent + liu, fileident, -offset);
-                        memcpy(fibh->ebh->b_data, fileident - offset, lfi + offset);
+                else {
+                        memcpy((uint8_t *) sfi->fileIdent + liu, fileident,
+                               -offset);
+                        memcpy(fibh->ebh->b_data, fileident - offset,
+                               lfi + offset);
                 }
         }
 
         offset += lfi;
 
         if (adinicb || (offset + padlen < 0))
-                memset((uint8_t *)sfi->padding + liu + lfi, 0x00, padlen);
+                memset((uint8_t *) sfi->padding + liu + lfi, 0x00, padlen);
         else if (offset >= 0)
                 memset(fibh->ebh->b_data + offset, 0x00, padlen);
-        else
-        {
-                memset((uint8_t *)sfi->padding + liu + lfi, 0x00, -offset);
+        else {
+                memset((uint8_t *) sfi->padding + liu + lfi, 0x00, -offset);
                 memset(fibh->ebh->b_data, 0x00, padlen + offset);
         }
 
-        crc = udf_crc((uint8_t *)cfi + sizeof(tag), sizeof(struct fileIdentDesc) -
-                sizeof(tag), 0);
+        crc =
+            udf_crc((uint8_t *) cfi + sizeof(tag),
+                    sizeof(struct fileIdentDesc) - sizeof(tag), 0);
 
         if (fibh->sbh == fibh->ebh)
-                crc = udf_crc((uint8_t *)sfi->impUse,
-                        crclen + sizeof(tag) - sizeof(struct fileIdentDesc), crc);
+                crc = udf_crc((uint8_t *) sfi->impUse,
+                              crclen + sizeof(tag) -
+                              sizeof(struct fileIdentDesc), crc);
         else if (sizeof(struct fileIdentDesc) >= -fibh->soffset)
-                crc = udf_crc(fibh->ebh->b_data + sizeof(struct fileIdentDesc) + fibh->soffset,
-                        crclen + sizeof(tag) - sizeof(struct fileIdentDesc), crc);
-        else
-        {
-                crc = udf_crc((uint8_t *)sfi->impUse,
-                        -fibh->soffset - sizeof(struct fileIdentDesc), crc);
+                crc =
+                    udf_crc(fibh->ebh->b_data + sizeof(struct fileIdentDesc) +
+                            fibh->soffset,
+                            crclen + sizeof(tag) - sizeof(struct fileIdentDesc),
+                            crc);
+        else {
+                crc = udf_crc((uint8_t *) sfi->impUse,
+                              -fibh->soffset - sizeof(struct fileIdentDesc),
+                              crc);
                 crc = udf_crc(fibh->ebh->b_data, fibh->eoffset, crc);
         }
 
         cfi->descTag.descCRC = cpu_to_le16(crc);
         cfi->descTag.descCRCLength = cpu_to_le16(crclen);
 
-        for (i=0; i<16; i++)
+        for (i = 0; i < 16; i++)
                 if (i != 4)
-                        checksum += ((uint8_t *)&cfi->descTag)[i];
+                        checksum += ((uint8_t *) & cfi->descTag)[i];
 
         cfi->descTag.tagChecksum = checksum;
         if (adinicb || (sizeof(struct fileIdentDesc) <= -fibh->soffset))
-                memcpy((uint8_t *)sfi, (uint8_t *)cfi, sizeof(struct fileIdentDesc));
-        else
-        {
-                memcpy((uint8_t *)sfi, (uint8_t *)cfi, -fibh->soffset);
-                memcpy(fibh->ebh->b_data, (uint8_t *)cfi - fibh->soffset,
-                        sizeof(struct fileIdentDesc) + fibh->soffset);
+                memcpy((uint8_t *) sfi, (uint8_t *) cfi,
+                       sizeof(struct fileIdentDesc));
+        else {
+                memcpy((uint8_t *) sfi, (uint8_t *) cfi, -fibh->soffset);
+                memcpy(fibh->ebh->b_data, (uint8_t *) cfi - fibh->soffset,
+                       sizeof(struct fileIdentDesc) + fibh->soffset);
         }
 
         if (adinicb)
                 mark_inode_dirty(inode);
-        else
-        {
+        else {
                 if (fibh->sbh != fibh->ebh)
                         mark_buffer_dirty_inode(fibh->ebh, inode);
                 mark_buffer_dirty_inode(fibh->sbh, inode);
@@ -143,12 +147,12 @@ int udf_write_fi(struct inode *inode, struct fileIdentDesc *cfi,
         return 0;
 }
 
-static struct fileIdentDesc *
-udf_find_entry(struct inode *dir, struct dentry *dentry,
-        struct udf_fileident_bh *fibh,
-        struct fileIdentDesc *cfi)
+static struct fileIdentDesc *udf_find_entry(struct inode *dir,
+                                            struct dentry *dentry,
+                                            struct udf_fileident_bh *fibh,
+                                            struct fileIdentDesc *cfi)
 {
-        struct fileIdentDesc *fi=NULL;
+        struct fileIdentDesc *fi = NULL;
         loff_t f_pos;
         int block, flen;
         char fname[UDF_NAME_LEN];
@@ -159,46 +163,41 @@ udf_find_entry(struct inode *dir, struct dentry *dentry,
         kernel_lb_addr eloc;
         uint32_t elen;
         sector_t offset;
-        struct extent_position epos = { NULL, 0, { 0, 0}};
+        struct extent_position epos = { NULL, 0, {0, 0} };
 
         size = (udf_ext0_offset(dir) + dir->i_size) >> 2;
         f_pos = (udf_ext0_offset(dir) >> 2);
 
-        fibh->soffset = fibh->eoffset = (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2;
+        fibh->soffset = fibh->eoffset =
+            (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2;
         if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
                 fibh->sbh = fibh->ebh = NULL;
         else if (inode_bmap(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2),
-                &epos, &eloc, &elen, &offset) == (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 ((++offset << dir->i_sb->s_blocksize_bits) < elen) {
                         if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_SHORT)
                                 epos.offset -= sizeof(short_ad);
                         else if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_LONG)
                                 epos.offset -= sizeof(long_ad);
-                }
-                else
+                } else
                         offset = 0;
 
-                if (!(fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block)))
-                {
+                if (!(fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block))) {
                         brelse(epos.bh);
                         return NULL;
                 }
-        }
-        else
-        {
+        } else {
                 brelse(epos.bh);
                 return NULL;
         }
 
-        while ( (f_pos < size) )
-        {
-                fi = udf_fileident_read(dir, &f_pos, fibh, cfi, &epos, &eloc, &elen, &offset);
+        while ((f_pos < size)) {
+                fi = udf_fileident_read(dir, &f_pos, fibh, cfi, &epos, &eloc,
+                                        &elen, &offset);
 
-                if (!fi)
-                {
+                if (!fi) {
                         if (fibh->sbh != fibh->ebh)
                                 brelse(fibh->ebh);
                         brelse(fibh->sbh);
@@ -209,45 +208,45 @@ udf_find_entry(struct inode *dir, struct dentry *dentry,
                 liu = le16_to_cpu(cfi->lengthOfImpUse);
                 lfi = cfi->lengthFileIdent;
 
-                if (fibh->sbh == fibh->ebh)
-                {
+                if (fibh->sbh == fibh->ebh) {
                         nameptr = fi->fileIdent + liu;
-                }
-                else
-                {
+                } else {
                         int poffset;    /* Unpaded ending offset */
 
-                        poffset = fibh->soffset + sizeof(struct fileIdentDesc) + liu + lfi;
+                        poffset =
+                            fibh->soffset + sizeof(struct fileIdentDesc) + liu +
+                            lfi;
 
                         if (poffset >= lfi)
-                                nameptr = (uint8_t *)(fibh->ebh->b_data + poffset - lfi);
-                        else
-                        {
+                                nameptr =
+                                    (uint8_t *) (fibh->ebh->b_data + poffset -
+                                                 lfi);
+                        else {
                                 nameptr = fname;
-                                memcpy(nameptr, fi->fileIdent + liu, lfi - poffset);
-                                memcpy(nameptr + lfi - poffset, fibh->ebh->b_data, poffset);
+                                memcpy(nameptr, fi->fileIdent + liu,
+                                       lfi - poffset);
+                                memcpy(nameptr + lfi - poffset,
+                                       fibh->ebh->b_data, poffset);
                         }
                 }
 
-                if ( (cfi->fileCharacteristics & FID_FILE_CHAR_DELETED) != 0 )
-                {
-                        if ( !UDF_QUERY_FLAG(dir->i_sb, UDF_FLAG_UNDELETE) )
+                if ((cfi->fileCharacteristics & FID_FILE_CHAR_DELETED) != 0) {
+                        if (!UDF_QUERY_FLAG(dir->i_sb, UDF_FLAG_UNDELETE))
                                 continue;
                 }
-            
-                if ( (cfi->fileCharacteristics & FID_FILE_CHAR_HIDDEN) != 0 )
-                {
-                        if ( !UDF_QUERY_FLAG(dir->i_sb, UDF_FLAG_UNHIDE) )
+
+                if ((cfi->fileCharacteristics & FID_FILE_CHAR_HIDDEN) != 0) {
+                        if (!UDF_QUERY_FLAG(dir->i_sb, UDF_FLAG_UNHIDE))
                                 continue;
                 }
 
                 if (!lfi)
                         continue;
 
-                if ((flen = udf_get_filename(dir->i_sb, nameptr, fname, lfi)))
-                {
-                        if (udf_match(flen, fname, dentry->d_name.len, dentry->d_name.name))
-                        {
+                if ((flen = udf_get_filename(dir->i_sb, nameptr, fname, lfi))) {
+                        if (udf_match
+                            (flen, fname, dentry->d_name.len,
+                             dentry->d_name.name)) {
                                 brelse(epos.bh);
                                 return fi;
                         }
@@ -293,41 +292,37 @@ udf_find_entry(struct inode *dir, struct dentry *dentry,
  *      Written, tested, and released.
  */
 
-static struct dentry *
-udf_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
+static struct dentry *udf_lookup(struct inode *dir, struct dentry *dentry,
+                                 struct nameidata *nd)
 {
         struct inode *inode = NULL;
         struct fileIdentDesc cfi;
         struct udf_fileident_bh fibh;
 
-        if (dentry->d_name.len > UDF_NAME_LEN-2)
+        if (dentry->d_name.len > UDF_NAME_LEN - 2)
                 return ERR_PTR(-ENAMETOOLONG);
 
         lock_kernel();
 #ifdef UDF_RECOVERY
         /* temporary shorthand for specifying files by inode number */
-        if (!strncmp(dentry->d_name.name, ".B=", 3) )
-        {
-                kernel_lb_addr lb = { 0, simple_strtoul(dentry->d_name.name+3, NULL, 0) };
+        if (!strncmp(dentry->d_name.name, ".B=", 3)) {
+                kernel_lb_addr lb =
+                    { 0, simple_strtoul(dentry->d_name.name + 3, NULL, 0) };
                 inode = udf_iget(dir->i_sb, lb);
-                if (!inode)
-                {
+                if (!inode) {
                         unlock_kernel();
                         return ERR_PTR(-EACCES);
                 }
-        }
-        else
-#endif /* UDF_RECOVERY */
+        } else
+#endif                          /* UDF_RECOVERY */
 
-        if (udf_find_entry(dir, dentry, &fibh, &cfi))
-        {
+        if (udf_find_entry(dir, dentry, &fibh, &cfi)) {
                 if (fibh.sbh != fibh.ebh)
                         brelse(fibh.ebh);
                 brelse(fibh.sbh);
 
                 inode = udf_iget(dir->i_sb, lelb_to_cpu(cfi.icb.extLocation));
-                if ( !inode )
-                {
+                if (!inode) {
                         unlock_kernel();
                         return ERR_PTR(-EACCES);
                 }
@@ -337,13 +332,13 @@ udf_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
         return NULL;
 }
 
-static struct fileIdentDesc *
-udf_add_entry(struct inode *dir, struct dentry *dentry,
-        struct udf_fileident_bh *fibh,
-        struct fileIdentDesc *cfi, int *err)
+static struct fileIdentDesc *udf_add_entry(struct inode *dir,
+                                           struct dentry *dentry,
+                                           struct udf_fileident_bh *fibh,
+                                           struct fileIdentDesc *cfi, int *err)
 {
         struct super_block *sb;
-        struct fileIdentDesc *fi=NULL;
+        struct fileIdentDesc *fi = NULL;
         char name[UDF_NAME_LEN], fname[UDF_NAME_LEN];
         int namelen;
         loff_t f_pos;
@@ -357,50 +352,47 @@ udf_add_entry(struct inode *dir, struct dentry *dentry,
         kernel_lb_addr eloc;
         uint32_t elen;
         sector_t offset;
-        struct extent_position epos = { NULL, 0, { 0, 0 }};
+        struct extent_position epos = { NULL, 0, {0, 0} };
 
         sb = dir->i_sb;
 
-        if (dentry)
-        {
-                if (!dentry->d_name.len)
-                {
+        if (dentry) {
+                if (!dentry->d_name.len) {
                         *err = -EINVAL;
                         return NULL;
                 }
 
-                if ( !(namelen = udf_put_filename(sb, dentry->d_name.name, name, dentry->d_name.len)))
-                {
+                if (!
+                    (namelen =
+                     udf_put_filename(sb, dentry->d_name.name, name,
+                                      dentry->d_name.len))) {
                         *err = -ENAMETOOLONG;
                         return NULL;
                 }
-        }
-        else
+        } else
                 namelen = 0;
 
         nfidlen = (sizeof(struct fileIdentDesc) + namelen + 3) & ~3;
 
         f_pos = (udf_ext0_offset(dir) >> 2);
 
-        fibh->soffset = fibh->eoffset = (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2;
+        fibh->soffset = fibh->eoffset =
+            (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2;
         if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
                 fibh->sbh = fibh->ebh = NULL;
         else if (inode_bmap(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2),
-                &epos, &eloc, &elen, &offset) == (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 ((++offset << dir->i_sb->s_blocksize_bits) < elen) {
                         if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_SHORT)
                                 epos.offset -= sizeof(short_ad);
                         else if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_LONG)
                                 epos.offset -= sizeof(long_ad);
-                }
-                else
+                } else
                         offset = 0;
 
-                if (!(fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block)))
-                {
+                if (!(fibh->sbh = fibh->ebh = udf_tread(dir->i_sb, block))) {
                         brelse(epos.bh);
                         *err = -EIO;
                         return NULL;
@@ -408,21 +400,18 @@ udf_add_entry(struct inode *dir, struct dentry *dentry,
 
                 block = UDF_I_LOCATION(dir).logicalBlockNum;
 
-        }
-        else
-        {
+        } else {
                 block = udf_get_lb_pblock(dir->i_sb, UDF_I_LOCATION(dir), 0);
                 fibh->sbh = fibh->ebh = NULL;
                 fibh->soffset = fibh->eoffset = sb->s_blocksize;
                 goto add;
         }
 
-        while ( (f_pos < size) )
-        {
-                fi = udf_fileident_read(dir, &f_pos, fibh, cfi, &epos, &eloc, &elen, &offset);
+        while ((f_pos < size)) {
+                fi = udf_fileident_read(dir, &f_pos, fibh, cfi, &epos, &eloc,
+                                        &elen, &offset);
 
-                if (!fi)
-                {
+                if (!fi) {
                         if (fibh->sbh != fibh->ebh)
                                 brelse(fibh->ebh);
                         brelse(fibh->sbh);
@@ -436,36 +425,38 @@ udf_add_entry(struct inode *dir, struct dentry *dentry,
 
                 if (fibh->sbh == fibh->ebh)
                         nameptr = fi->fileIdent + liu;
-                else
-                {
+                else {
                         int poffset;    /* Unpaded ending offset */
 
-                        poffset = fibh->soffset + sizeof(struct fileIdentDesc) + liu + lfi;
+                        poffset =
+                            fibh->soffset + sizeof(struct fileIdentDesc) + liu +
+                            lfi;
 
                         if (poffset >= lfi)
-                                nameptr = (char *)(fibh->ebh->b_data + poffset - lfi);
-                        else
-                        {
+                                nameptr =
+                                    (char *)(fibh->ebh->b_data + poffset - lfi);
+                        else {
                                 nameptr = fname;
-                                memcpy(nameptr, fi->fileIdent + liu, lfi - poffset);
-                                memcpy(nameptr + lfi - poffset, fibh->ebh->b_data, poffset);
+                                memcpy(nameptr, fi->fileIdent + liu,
+                                       lfi - poffset);
+                                memcpy(nameptr + lfi - poffset,
+                                       fibh->ebh->b_data, poffset);
                         }
                 }
 
-                if ( (cfi->fileCharacteristics & FID_FILE_CHAR_DELETED) != 0 )
-                {
-                        if (((sizeof(struct fileIdentDesc) + liu + lfi + 3) & ~3) == nfidlen)
-                        {
+                if ((cfi->fileCharacteristics & FID_FILE_CHAR_DELETED) != 0) {
+                        if (((sizeof(struct fileIdentDesc) + liu + lfi +
+                              3) & ~3) == nfidlen) {
                                 brelse(epos.bh);
                                 cfi->descTag.tagSerialNum = cpu_to_le16(1);
                                 cfi->fileVersionNum = cpu_to_le16(1);
                                 cfi->fileCharacteristics = 0;
                                 cfi->lengthFileIdent = namelen;
                                 cfi->lengthOfImpUse = cpu_to_le16(0);
-                                if (!udf_write_fi(dir, cfi, fi, fibh, NULL, name))
+                                if (!udf_write_fi
+                                    (dir, cfi, fi, fibh, NULL, name))
                                         return fi;
-                                else
-                                {
+                                else {
                                         *err = -EIO;
                                         return NULL;
                                 }
@@ -476,8 +467,8 @@ udf_add_entry(struct inode *dir, struct dentry *dentry,
                         continue;
 
                 if ((flen = udf_get_filename(dir->i_sb, nameptr, fname, lfi)) &&
-                        udf_match(flen, fname, dentry->d_name.len, dentry->d_name.name))
-                {
+                    udf_match(flen, fname, dentry->d_name.len,
+                              dentry->d_name.name)) {
                         if (fibh->sbh != fibh->ebh)
                                 brelse(fibh->ebh);
                         brelse(fibh->sbh);
@@ -487,12 +478,11 @@ udf_add_entry(struct inode *dir, struct dentry *dentry,
                 }
         }
 
-add:
+      add:
         f_pos += nfidlen;
 
         if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB &&
-                sb->s_blocksize - fibh->eoffset < nfidlen)
-        {
+            sb->s_blocksize - fibh->eoffset < nfidlen) {
                 brelse(epos.bh);
                 epos.bh = NULL;
                 fibh->soffset -= udf_ext0_offset(dir);
@@ -501,11 +491,14 @@ add:
                 if (fibh->sbh != fibh->ebh)
                         brelse(fibh->ebh);
                 brelse(fibh->sbh);
-                if (!(fibh->sbh = fibh->ebh = udf_expand_dir_adinicb(dir, &block, err)))
+                if (!
+                    (fibh->sbh = fibh->ebh =
+                     udf_expand_dir_adinicb(dir, &block, err)))
                         return NULL;
                 epos.block = UDF_I_LOCATION(dir);
                 eloc.logicalBlockNum = block;
-                eloc.partitionReferenceNum = UDF_I_LOCATION(dir).partitionReferenceNum;
+                eloc.partitionReferenceNum =
+                    UDF_I_LOCATION(dir).partitionReferenceNum;
                 elen = dir->i_sb->s_blocksize;
                 epos.offset = udf_file_entry_alloc_offset(dir);
                 if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_SHORT)
@@ -514,89 +507,84 @@ add:
                         epos.offset += sizeof(long_ad);
         }
 
-        if (sb->s_blocksize - fibh->eoffset >= nfidlen)
-        {
+        if (sb->s_blocksize - fibh->eoffset >= nfidlen) {
                 fibh->soffset = fibh->eoffset;
                 fibh->eoffset += nfidlen;
-                if (fibh->sbh != fibh->ebh)
-                {
+                if (fibh->sbh != fibh->ebh) {
                         brelse(fibh->sbh);
                         fibh->sbh = fibh->ebh;
                 }
 
-                if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
-                {
+                if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB) {
                         block = UDF_I_LOCATION(dir).logicalBlockNum;
-                        fi = (struct fileIdentDesc *)(UDF_I_DATA(dir) + fibh->soffset - udf_ext0_offset(dir) + UDF_I_LENEATTR(dir));
-                }
-                else
-                {
+                        fi = (struct fileIdentDesc *)(UDF_I_DATA(dir) +
+                                                      fibh->soffset -
+                                                      udf_ext0_offset(dir) +
+                                                      UDF_I_LENEATTR(dir));
+                } else {
                         block = eloc.logicalBlockNum + ((elen - 1) >>
-                                dir->i_sb->s_blocksize_bits);
-                        fi = (struct fileIdentDesc *)(fibh->sbh->b_data + fibh->soffset);
+                                                        dir->i_sb->
+                                                        s_blocksize_bits);
+                        fi = (struct fileIdentDesc *)(fibh->sbh->b_data +
+                                                      fibh->soffset);
                 }
-        }
-        else
-        {
+        } else {
                 fibh->soffset = fibh->eoffset - sb->s_blocksize;
                 fibh->eoffset += nfidlen - sb->s_blocksize;
-                if (fibh->sbh != fibh->ebh)
-                {
+                if (fibh->sbh != fibh->ebh) {
                         brelse(fibh->sbh);
                         fibh->sbh = fibh->ebh;
                 }
 
                 block = eloc.logicalBlockNum + ((elen - 1) >>
-                        dir->i_sb->s_blocksize_bits);
+                                                dir->i_sb->s_blocksize_bits);
 
-                if (!(fibh->ebh = udf_bread(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2), 1, err)))
-                {
+                if (!
+                    (fibh->ebh =
+                     udf_bread(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2),
+                               1, err))) {
                         brelse(epos.bh);
                         brelse(fibh->sbh);
                         return NULL;
                 }
 
-                if (!(fibh->soffset))
-                {
+                if (!(fibh->soffset)) {
                         if (udf_next_aext(dir, &epos, &eloc, &elen, 1) ==
-                                (EXT_RECORDED_ALLOCATED >> 30))
-                        {
+                            (EXT_RECORDED_ALLOCATED >> 30)) {
                                 block = eloc.logicalBlockNum + ((elen - 1) >>
-                                        dir->i_sb->s_blocksize_bits);
-                        }
-                        else
-                                block ++;
+                                                                dir->i_sb->
+                                                                s_blocksize_bits);
+                        } else
+                                block++;
 
                         brelse(fibh->sbh);
                         fibh->sbh = fibh->ebh;
                         fi = (struct fileIdentDesc *)(fibh->sbh->b_data);
-                }
-                else
-                {
+                } else {
                         fi = (struct fileIdentDesc *)
-                                (fibh->sbh->b_data + sb->s_blocksize + fibh->soffset);
+                            (fibh->sbh->b_data + sb->s_blocksize +
+                             fibh->soffset);
                 }
         }
 
         memset(cfi, 0, sizeof(struct fileIdentDesc));
         if (UDF_SB_UDFREV(sb) >= 0x0200)
-                udf_new_tag((char *)cfi, TAG_IDENT_FID, 3, 1, block, sizeof(tag));
+                udf_new_tag((char *)cfi, TAG_IDENT_FID, 3, 1, block,
+                            sizeof(tag));
         else
-                udf_new_tag((char *)cfi, TAG_IDENT_FID, 2, 1, block, sizeof(tag));
+                udf_new_tag((char *)cfi, TAG_IDENT_FID, 2, 1, block,
+                            sizeof(tag));
         cfi->fileVersionNum = cpu_to_le16(1);
         cfi->lengthFileIdent = namelen;
         cfi->lengthOfImpUse = cpu_to_le16(0);
-        if (!udf_write_fi(dir, cfi, fi, fibh, NULL, name))
-        {
+        if (!udf_write_fi(dir, cfi, fi, fibh, NULL, name)) {
                 brelse(epos.bh);
                 dir->i_size += nfidlen;
                 if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
                         UDF_I_LENALLOC(dir) += nfidlen;
                 mark_inode_dirty(dir);
                 return fi;
-        }
-        else
-        {
+        } else {
                 brelse(epos.bh);
                 if (fibh->sbh != fibh->ebh)
                         brelse(fibh->ebh);
@@ -607,7 +595,8 @@ add:
 }
 
 static int udf_delete_entry(struct inode *inode, struct fileIdentDesc *fi,
-        struct udf_fileident_bh *fibh, struct fileIdentDesc *cfi)
+                            struct udf_fileident_bh *fibh,
+                            struct fileIdentDesc *cfi)
 {
         cfi->fileCharacteristics |= FID_FILE_CHAR_DELETED;
         if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT))
@@ -615,7 +604,8 @@ static int udf_delete_entry(struct inode *inode, struct fileIdentDesc *fi,
         return udf_write_fi(inode, cfi, fi, fibh, NULL, NULL);
 }
 
-static int udf_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *nd)
+static int udf_create(struct inode *dir, struct dentry *dentry, int mode,
+                      struct nameidata *nd)
 {
         struct udf_fileident_bh fibh;
         struct inode *inode;
@@ -624,8 +614,7 @@ static int udf_create(struct inode *dir, struct dentry *dentry, int mode, struct
 
         lock_kernel();
         inode = udf_new_inode(dir, mode, &err);
-        if (!inode)
-        {
+        if (!inode) {
                 unlock_kernel();
                 return err;
         }
@@ -639,9 +628,8 @@ static int udf_create(struct inode *dir, struct dentry *dentry, int mode, struct
         inode->i_mode = mode;
         mark_inode_dirty(inode);
 
-        if (!(fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err)))
-        {
-                inode->i_nlink --;
+        if (!(fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err))) {
+                inode->i_nlink--;
                 mark_inode_dirty(inode);
                 iput(inode);
                 unlock_kernel();
@@ -649,11 +637,10 @@ static int udf_create(struct inode *dir, struct dentry *dentry, int mode, struct
         }
         cfi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize);
         cfi.icb.extLocation = cpu_to_lelb(UDF_I_LOCATION(inode));
-        *(__le32 *)((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
-                cpu_to_le32(UDF_I_UNIQUE(inode) & 0x00000000FFFFFFFFUL);
+        *(__le32 *) ((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
+            cpu_to_le32(UDF_I_UNIQUE(inode) & 0x00000000FFFFFFFFUL);
         udf_write_fi(dir, &cfi, fi, &fibh, NULL, NULL);
-        if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
-        {
+        if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB) {
                 mark_inode_dirty(dir);
         }
         if (fibh.sbh != fibh.ebh)
@@ -664,9 +651,10 @@ static int udf_create(struct inode *dir, struct dentry *dentry, int mode, struct
         return 0;
 }
 
-static int udf_mknod(struct inode * dir, struct dentry * dentry, int mode, dev_t rdev)
+static int udf_mknod(struct inode *dir, struct dentry *dentry, int mode,
+                     dev_t rdev)
 {
-        struct inode * inode;
+        struct inode *inode;
         struct udf_fileident_bh fibh;
         struct fileIdentDesc cfi, *fi;
         int err;
@@ -682,9 +670,8 @@ static int udf_mknod(struct inode * dir, struct dentry * dentry, int mode, dev_t
 
         inode->i_uid = current->fsuid;
         init_special_inode(inode, mode, rdev);
-        if (!(fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err)))
-        {
-                inode->i_nlink --;
+        if (!(fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err))) {
+                inode->i_nlink--;
                 mark_inode_dirty(inode);
                 iput(inode);
                 unlock_kernel();
@@ -692,11 +679,10 @@ static int udf_mknod(struct inode * dir, struct dentry * dentry, int mode, dev_t
         }
         cfi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize);
         cfi.icb.extLocation = cpu_to_lelb(UDF_I_LOCATION(inode));
-        *(__le32 *)((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
-                cpu_to_le32(UDF_I_UNIQUE(inode) & 0x00000000FFFFFFFFUL);
+        *(__le32 *) ((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
+            cpu_to_le32(UDF_I_UNIQUE(inode) & 0x00000000FFFFFFFFUL);
         udf_write_fi(dir, &cfi, fi, &fibh, NULL, NULL);
-        if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
-        {
+        if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB) {
                 mark_inode_dirty(dir);
         }
         mark_inode_dirty(inode);
@@ -706,21 +692,21 @@ static int udf_mknod(struct inode * dir, struct dentry * dentry, int mode, dev_t
         brelse(fibh.sbh);
         d_instantiate(dentry, inode);
         err = 0;
-out:
+      out:
         unlock_kernel();
         return err;
 }
 
-static int udf_mkdir(struct inode * dir, struct dentry * dentry, int mode)
+static int udf_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
-        struct inode * inode;
+        struct inode *inode;
         struct udf_fileident_bh fibh;
         struct fileIdentDesc cfi, *fi;
         int err;
 
         lock_kernel();
         err = -EMLINK;
-        if (dir->i_nlink >= (256<<sizeof(dir->i_nlink))-1)
+        if (dir->i_nlink >= (256 << sizeof(dir->i_nlink)) - 1)
                 goto out;
 
         err = -EIO;
@@ -730,8 +716,7 @@ static int udf_mkdir(struct inode * dir, struct dentry * dentry, int mode)
 
         inode->i_op = &udf_dir_inode_operations;
         inode->i_fop = &udf_dir_operations;
-        if (!(fi = udf_add_entry(inode, NULL, &fibh, &cfi, &err)))
-        {
+        if (!(fi = udf_add_entry(inode, NULL, &fibh, &cfi, &err))) {
                 inode->i_nlink--;
                 mark_inode_dirty(inode);
                 iput(inode);
@@ -740,9 +725,10 @@ static int udf_mkdir(struct inode * dir, struct dentry * dentry, int mode)
         inode->i_nlink = 2;
         cfi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize);
         cfi.icb.extLocation = cpu_to_lelb(UDF_I_LOCATION(dir));
-        *(__le32 *)((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
-                cpu_to_le32(UDF_I_UNIQUE(dir) & 0x00000000FFFFFFFFUL);
-        cfi.fileCharacteristics = FID_FILE_CHAR_DIRECTORY | FID_FILE_CHAR_PARENT;
+        *(__le32 *) ((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
+            cpu_to_le32(UDF_I_UNIQUE(dir) & 0x00000000FFFFFFFFUL);
+        cfi.fileCharacteristics =
+            FID_FILE_CHAR_DIRECTORY | FID_FILE_CHAR_PARENT;
         udf_write_fi(inode, &cfi, fi, &fibh, NULL, NULL);
         brelse(fibh.sbh);
         inode->i_mode = S_IFDIR | mode;
@@ -750,8 +736,7 @@ static int udf_mkdir(struct inode * dir, struct dentry * dentry, int mode)
                 inode->i_mode |= S_ISGID;
         mark_inode_dirty(inode);
 
-        if (!(fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err)))
-        {
+        if (!(fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err))) {
                 inode->i_nlink = 0;
                 mark_inode_dirty(inode);
                 iput(inode);
@@ -759,8 +744,8 @@ static int udf_mkdir(struct inode * dir, struct dentry * dentry, int mode)
         }
         cfi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize);
         cfi.icb.extLocation = cpu_to_lelb(UDF_I_LOCATION(inode));
-        *(__le32 *)((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
-                cpu_to_le32(UDF_I_UNIQUE(inode) & 0x00000000FFFFFFFFUL);
+        *(__le32 *) ((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
+            cpu_to_le32(UDF_I_UNIQUE(inode) & 0x00000000FFFFFFFFUL);
         cfi.fileCharacteristics |= FID_FILE_CHAR_DIRECTORY;
         udf_write_fi(dir, &cfi, fi, &fibh, NULL, NULL);
         inc_nlink(dir);
@@ -770,7 +755,7 @@ static int udf_mkdir(struct inode * dir, struct dentry * dentry, int mode)
                 brelse(fibh.ebh);
         brelse(fibh.sbh);
         err = 0;
-out:
+      out:
         unlock_kernel();
         return err;
 }
@@ -785,47 +770,41 @@ static int empty_dir(struct inode *dir)
         kernel_lb_addr eloc;
         uint32_t elen;
         sector_t offset;
-        struct extent_position epos = { NULL, 0, { 0, 0}};
+        struct extent_position epos = { NULL, 0, {0, 0} };
 
         f_pos = (udf_ext0_offset(dir) >> 2);
 
-        fibh.soffset = fibh.eoffset = (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2;
+        fibh.soffset = fibh.eoffset =
+            (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2;
 
         if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
                 fibh.sbh = fibh.ebh = NULL;
         else if (inode_bmap(dir, f_pos >> (dir->i_sb->s_blocksize_bits - 2),
-                &epos, &eloc, &elen, &offset) == (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 ((++offset << dir->i_sb->s_blocksize_bits) < elen) {
                         if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_SHORT)
                                 epos.offset -= sizeof(short_ad);
                         else if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_LONG)
                                 epos.offset -= sizeof(long_ad);
-                }
-                else
+                } else
                         offset = 0;
 
-                if (!(fibh.sbh = fibh.ebh = udf_tread(dir->i_sb, block)))
-                {
+                if (!(fibh.sbh = fibh.ebh = udf_tread(dir->i_sb, block))) {
                         brelse(epos.bh);
                         return 0;
                 }
-        }
-        else
-        {
+        } else {
                 brelse(epos.bh);
                 return 0;
         }
 
+        while ((f_pos < size)) {
+                fi = udf_fileident_read(dir, &f_pos, &fibh, &cfi, &epos, &eloc,
+                                        &elen, &offset);
 
-        while ( (f_pos < size) )
-        {
-                fi = udf_fileident_read(dir, &f_pos, &fibh, &cfi, &epos, &eloc, &elen, &offset);
-
-                if (!fi)
-                {
+                if (!fi) {
                         if (fibh.sbh != fibh.ebh)
                                 brelse(fibh.ebh);
                         brelse(fibh.sbh);
@@ -833,8 +812,8 @@ static int empty_dir(struct inode *dir)
                         return 0;
                 }
 
-                if (cfi.lengthFileIdent && (cfi.fileCharacteristics & FID_FILE_CHAR_DELETED) == 0)
-                {
+                if (cfi.lengthFileIdent
+                    && (cfi.fileCharacteristics & FID_FILE_CHAR_DELETED) == 0) {
                         if (fibh.sbh != fibh.ebh)
                                 brelse(fibh.ebh);
                         brelse(fibh.sbh);
@@ -849,10 +828,10 @@ static int empty_dir(struct inode *dir)
         return 1;
 }
 
-static int udf_rmdir(struct inode * dir, struct dentry * dentry)
+static int udf_rmdir(struct inode *dir, struct dentry *dentry)
 {
         int retval;
-        struct inode * inode = dentry->d_inode;
+        struct inode *inode = dentry->d_inode;
         struct udf_fileident_bh fibh;
         struct fileIdentDesc *fi, cfi;
         kernel_lb_addr tloc;
@@ -875,27 +854,28 @@ static int udf_rmdir(struct inode * dir, struct dentry * dentry)
                 goto end_rmdir;
         if (inode->i_nlink != 2)
                 udf_warning(inode->i_sb, "udf_rmdir",
-                        "empty directory has nlink != 2 (%d)",
-                        inode->i_nlink);
+                            "empty directory has nlink != 2 (%d)",
+                            inode->i_nlink);
         clear_nlink(inode);
         inode->i_size = 0;
         inode_dec_link_count(dir);
-        inode->i_ctime = dir->i_ctime = dir->i_mtime = current_fs_time(dir->i_sb);
+        inode->i_ctime = dir->i_ctime = dir->i_mtime =
+            current_fs_time(dir->i_sb);
         mark_inode_dirty(dir);
 
-end_rmdir:
+      end_rmdir:
         if (fibh.sbh != fibh.ebh)
                 brelse(fibh.ebh);
         brelse(fibh.sbh);
-out:
+      out:
         unlock_kernel();
         return retval;
 }
 
-static int udf_unlink(struct inode * dir, struct dentry * dentry)
+static int udf_unlink(struct inode *dir, struct dentry *dentry)
 {
         int retval;
-        struct inode * inode = dentry->d_inode;
+        struct inode *inode = dentry->d_inode;
         struct udf_fileident_bh fibh;
         struct fileIdentDesc *fi;
         struct fileIdentDesc cfi;
@@ -912,10 +892,9 @@ static int udf_unlink(struct inode * dir, struct dentry * dentry)
         if (udf_get_lb_pblock(dir->i_sb, tloc, 0) != inode->i_ino)
                 goto end_unlink;
 
-        if (!inode->i_nlink)
-        {
+        if (!inode->i_nlink) {
                 udf_debug("Deleting nonexistent file (%lu), %d\n",
-                        inode->i_ino, inode->i_nlink);
+                          inode->i_ino, inode->i_nlink);
                 inode->i_nlink = 1;
         }
         retval = udf_delete_entry(dir, fi, &fibh, &cfi);
@@ -927,22 +906,23 @@ static int udf_unlink(struct inode * dir, struct dentry * dentry)
         inode->i_ctime = dir->i_ctime;
         retval = 0;
 
-end_unlink:
+      end_unlink:
         if (fibh.sbh != fibh.ebh)
                 brelse(fibh.ebh);
         brelse(fibh.sbh);
-out:
+      out:
         unlock_kernel();
         return retval;
 }
 
-static int udf_symlink(struct inode * dir, struct dentry * dentry, const char * symname)
+static int udf_symlink(struct inode *dir, struct dentry *dentry,
+                       const char *symname)
 {
-        struct inode * inode;
+        struct inode *inode;
         struct pathComponent *pc;
         char *compstart;
         struct udf_fileident_bh fibh;
-        struct extent_position epos = { NULL,  0, {0, 0}};
+        struct extent_position epos = { NULL, 0, {0, 0} };
         int eoffset, elen = 0;
         struct fileIdentDesc *fi;
         struct fileIdentDesc cfi;
@@ -960,28 +940,31 @@ static int udf_symlink(struct inode * dir, struct dentry * dentry, const char *
         inode->i_data.a_ops = &udf_symlink_aops;
         inode->i_op = &page_symlink_inode_operations;
 
-        if (UDF_I_ALLOCTYPE(inode) != ICBTAG_FLAG_AD_IN_ICB)
-        {
+        if (UDF_I_ALLOCTYPE(inode) != ICBTAG_FLAG_AD_IN_ICB) {
                 kernel_lb_addr eloc;
                 uint32_t elen;
 
                 block = udf_new_block(inode->i_sb, inode,
-                        UDF_I_LOCATION(inode).partitionReferenceNum,
-                        UDF_I_LOCATION(inode).logicalBlockNum, &err);
+                                      UDF_I_LOCATION(inode).
+                                      partitionReferenceNum,
+                                      UDF_I_LOCATION(inode).logicalBlockNum,
+                                      &err);
                 if (!block)
                         goto out_no_entry;
                 epos.block = UDF_I_LOCATION(inode);
                 epos.offset = udf_file_entry_alloc_offset(inode);
                 epos.bh = NULL;
                 eloc.logicalBlockNum = block;
-                eloc.partitionReferenceNum = UDF_I_LOCATION(inode).partitionReferenceNum;
+                eloc.partitionReferenceNum =
+                    UDF_I_LOCATION(inode).partitionReferenceNum;
                 elen = inode->i_sb->s_blocksize;
                 UDF_I_LENEXTENTS(inode) = elen;
                 udf_add_aext(inode, &epos, eloc, elen, 0);
                 brelse(epos.bh);
 
                 block = udf_get_pblock(inode->i_sb, block,
-                        UDF_I_LOCATION(inode).partitionReferenceNum, 0);
+                                       UDF_I_LOCATION(inode).
+                                       partitionReferenceNum, 0);
                 epos.bh = udf_tread(inode->i_sb, block);
                 lock_buffer(epos.bh);
                 memset(epos.bh->b_data, 0x00, inode->i_sb->s_blocksize);
@@ -989,17 +972,14 @@ static int udf_symlink(struct inode * dir, struct dentry * dentry, const char *
                 unlock_buffer(epos.bh);
                 mark_buffer_dirty_inode(epos.bh, inode);
                 ea = epos.bh->b_data + udf_ext0_offset(inode);
-        }
-        else
+        } else
                 ea = UDF_I_DATA(inode) + UDF_I_LENEATTR(inode);
 
         eoffset = inode->i_sb->s_blocksize - udf_ext0_offset(inode);
         pc = (struct pathComponent *)ea;
 
-        if (*symname == '/')
-        {
-                do
-                {
+        if (*symname == '/') {
+                do {
                         symname++;
                 } while (*symname == '/');
 
@@ -1012,8 +992,7 @@ static int udf_symlink(struct inode * dir, struct dentry * dentry, const char *
 
         err = -ENAMETOOLONG;
 
-        while (*symname)
-        {
+        while (*symname) {
                 if (elen + sizeof(struct pathComponent) > eoffset)
                         goto out_no_entry;
 
@@ -1021,28 +1000,30 @@ static int udf_symlink(struct inode * dir, struct dentry * dentry, const char *
 
                 compstart = (char *)symname;
 
-                do
-                {
+                do {
                         symname++;
                 } while (*symname && *symname != '/');
 
                 pc->componentType = 5;
                 pc->lengthComponentIdent = 0;
                 pc->componentFileVersionNum = 0;
-                if (compstart[0] == '.')
-                {
-                        if ((symname-compstart) == 1)
+                if (compstart[0] == '.') {
+                        if ((symname - compstart) == 1)
                                 pc->componentType = 4;
-                        else if ((symname-compstart) == 2 && compstart[1] == '.')
+                        else if ((symname - compstart) == 2
+                                 && compstart[1] == '.')
                                 pc->componentType = 3;
                 }
 
-                if (pc->componentType == 5)
-                {
-                        if ( !(namelen = udf_put_filename(inode->i_sb, compstart, name, symname-compstart)))
+                if (pc->componentType == 5) {
+                        if (!
+                            (namelen =
+                             udf_put_filename(inode->i_sb, compstart, name,
+                                              symname - compstart)))
                                 goto out_no_entry;
 
-                        if (elen + sizeof(struct pathComponent) + namelen > eoffset)
+                        if (elen + sizeof(struct pathComponent) + namelen >
+                            eoffset)
                                 goto out_no_entry;
                         else
                                 pc->lengthComponentIdent = namelen;
@@ -1052,10 +1033,8 @@ static int udf_symlink(struct inode * dir, struct dentry * dentry, const char *
 
                 elen += sizeof(struct pathComponent) + pc->lengthComponentIdent;
 
-                if (*symname)
-                {
-                        do
-                        {
+                if (*symname) {
+                        do {
                                 symname++;
                         } while (*symname == '/');
                 }
@@ -1071,22 +1050,22 @@ static int udf_symlink(struct inode * dir, struct dentry * dentry, const char *
                 goto out_no_entry;
         cfi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize);
         cfi.icb.extLocation = cpu_to_lelb(UDF_I_LOCATION(inode));
-        if (UDF_SB_LVIDBH(inode->i_sb))
-        {
+        if (UDF_SB_LVIDBH(inode->i_sb)) {
                 struct logicalVolHeaderDesc *lvhd;
                 uint64_t uniqueID;
-                lvhd = (struct logicalVolHeaderDesc *)(UDF_SB_LVID(inode->i_sb)->logicalVolContentsUse);
+                lvhd =
+                    (struct logicalVolHeaderDesc *)(UDF_SB_LVID(inode->i_sb)->
+                                                    logicalVolContentsUse);
                 uniqueID = le64_to_cpu(lvhd->uniqueID);
-                *(__le32 *)((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
-                        cpu_to_le32(uniqueID & 0x00000000FFFFFFFFUL);
+                *(__le32 *) ((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
+                    cpu_to_le32(uniqueID & 0x00000000FFFFFFFFUL);
                 if (!(++uniqueID & 0x00000000FFFFFFFFUL))
                         uniqueID += 16;
                 lvhd->uniqueID = cpu_to_le64(uniqueID);
                 mark_buffer_dirty(UDF_SB_LVIDBH(inode->i_sb));
         }
         udf_write_fi(dir, &cfi, fi, &fibh, NULL, NULL);
-        if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
-        {
+        if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB) {
                 mark_inode_dirty(dir);
         }
         if (fibh.sbh != fibh.ebh)
@@ -1095,18 +1074,18 @@ static int udf_symlink(struct inode * dir, struct dentry * dentry, const char *
         d_instantiate(dentry, inode);
         err = 0;
 
-out:
+      out:
         unlock_kernel();
         return err;
 
-out_no_entry:
+      out_no_entry:
         inode_dec_link_count(inode);
         iput(inode);
         goto out;
 }
 
-static int udf_link(struct dentry * old_dentry, struct inode * dir,
-         struct dentry *dentry)
+static int udf_link(struct dentry *old_dentry, struct inode *dir,
+                    struct dentry *dentry)
 {
         struct inode *inode = old_dentry->d_inode;
         struct udf_fileident_bh fibh;
@@ -1114,35 +1093,33 @@ static int udf_link(struct dentry * old_dentry, struct inode * dir,
         int err;
 
         lock_kernel();
-        if (inode->i_nlink >= (256<<sizeof(inode->i_nlink))-1)
-        {
+        if (inode->i_nlink >= (256 << sizeof(inode->i_nlink)) - 1) {
                 unlock_kernel();
                 return -EMLINK;
         }
 
-        if (!(fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err)))
-        {
+        if (!(fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err))) {
                 unlock_kernel();
                 return err;
         }
         cfi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize);
         cfi.icb.extLocation = cpu_to_lelb(UDF_I_LOCATION(inode));
-        if (UDF_SB_LVIDBH(inode->i_sb))
-        {
+        if (UDF_SB_LVIDBH(inode->i_sb)) {
                 struct logicalVolHeaderDesc *lvhd;
                 uint64_t uniqueID;
-                lvhd = (struct logicalVolHeaderDesc *)(UDF_SB_LVID(inode->i_sb)->logicalVolContentsUse);
+                lvhd =
+                    (struct logicalVolHeaderDesc *)(UDF_SB_LVID(inode->i_sb)->
+                                                    logicalVolContentsUse);
                 uniqueID = le64_to_cpu(lvhd->uniqueID);
-                *(__le32 *)((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
-                        cpu_to_le32(uniqueID & 0x00000000FFFFFFFFUL);
+                *(__le32 *) ((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
+                    cpu_to_le32(uniqueID & 0x00000000FFFFFFFFUL);
                 if (!(++uniqueID & 0x00000000FFFFFFFFUL))
                         uniqueID += 16;
                 lvhd->uniqueID = cpu_to_le64(uniqueID);
                 mark_buffer_dirty(UDF_SB_LVIDBH(inode->i_sb));
         }
         udf_write_fi(dir, &cfi, fi, &fibh, NULL, NULL);
-        if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB)
-        {
+        if (UDF_I_ALLOCTYPE(dir) == ICBTAG_FLAG_AD_IN_ICB) {
                 mark_inode_dirty(dir);
         }
         if (fibh.sbh != fibh.ebh)
@@ -1160,80 +1137,80 @@ static int udf_link(struct dentry * old_dentry, struct inode * dir,
 /* Anybody can rename anything with this: the permission checks are left to the
  * higher-level routines.
  */
-static int udf_rename (struct inode * old_dir, struct dentry * old_dentry,
-        struct inode * new_dir, struct dentry * new_dentry)
+static int udf_rename(struct inode *old_dir, struct dentry *old_dentry,
+                      struct inode *new_dir, struct dentry *new_dentry)
 {
-        struct inode * old_inode = old_dentry->d_inode;
-        struct inode * new_inode = new_dentry->d_inode;
+        struct inode *old_inode = old_dentry->d_inode;
+        struct inode *new_inode = new_dentry->d_inode;
         struct udf_fileident_bh ofibh, nfibh;
-        struct fileIdentDesc *ofi = NULL, *nfi = NULL, *dir_fi = NULL, ocfi, ncfi;
+        struct fileIdentDesc *ofi = NULL, *nfi = NULL, *dir_fi =
+            NULL, ocfi, ncfi;
         struct buffer_head *dir_bh = NULL;
         int retval = -ENOENT;
         kernel_lb_addr tloc;
 
         lock_kernel();
-        if ((ofi = udf_find_entry(old_dir, old_dentry, &ofibh, &ocfi)))
-        {
+        if ((ofi = udf_find_entry(old_dir, old_dentry, &ofibh, &ocfi))) {
                 if (ofibh.sbh != ofibh.ebh)
                         brelse(ofibh.ebh);
                 brelse(ofibh.sbh);
         }
         tloc = lelb_to_cpu(ocfi.icb.extLocation);
         if (!ofi || udf_get_lb_pblock(old_dir->i_sb, tloc, 0)
-                                        != old_inode->i_ino)
+            != old_inode->i_ino)
                 goto end_rename;
 
         nfi = udf_find_entry(new_dir, new_dentry, &nfibh, &ncfi);
-        if (nfi)
-        {
-                if (!new_inode)
-                {
+        if (nfi) {
+                if (!new_inode) {
                         if (nfibh.sbh != nfibh.ebh)
                                 brelse(nfibh.ebh);
                         brelse(nfibh.sbh);
                         nfi = NULL;
                 }
         }
-        if (S_ISDIR(old_inode->i_mode))
-        {
+        if (S_ISDIR(old_inode->i_mode)) {
                 uint32_t offset = udf_ext0_offset(old_inode);
 
-                if (new_inode)
-                {
+                if (new_inode) {
                         retval = -ENOTEMPTY;
                         if (!empty_dir(new_inode))
                                 goto end_rename;
                 }
                 retval = -EIO;
-                if (UDF_I_ALLOCTYPE(old_inode) == ICBTAG_FLAG_AD_IN_ICB)
-                {
+                if (UDF_I_ALLOCTYPE(old_inode) == ICBTAG_FLAG_AD_IN_ICB) {
                         dir_fi = udf_get_fileident(UDF_I_DATA(old_inode) -
-                                (UDF_I_EFE(old_inode) ?
-                                        sizeof(struct extendedFileEntry) :
-                                        sizeof(struct fileEntry)),
-                                old_inode->i_sb->s_blocksize, &offset);
-                }
-                else
-                {
+                                                   (UDF_I_EFE(old_inode) ?
+                                                    sizeof(struct
+                                                           extendedFileEntry) :
+                                                    sizeof(struct fileEntry)),
+                                                   old_inode->i_sb->s_blocksize,
+                                                   &offset);
+                } else {
                         dir_bh = udf_bread(old_inode, 0, 0, &retval);
                         if (!dir_bh)
                                 goto end_rename;
-                        dir_fi = udf_get_fileident(dir_bh->b_data, old_inode->i_sb->s_blocksize, &offset);
+                        dir_fi =
+                            udf_get_fileident(dir_bh->b_data,
+                                              old_inode->i_sb->s_blocksize,
+                                              &offset);
                 }
                 if (!dir_fi)
                         goto end_rename;
                 tloc = lelb_to_cpu(dir_fi->icb.extLocation);
                 if (udf_get_lb_pblock(old_inode->i_sb, tloc, 0)
-                                        != old_dir->i_ino)
+                    != old_dir->i_ino)
                         goto end_rename;
 
                 retval = -EMLINK;
-                if (!new_inode && new_dir->i_nlink >= (256<<sizeof(new_dir->i_nlink))-1)
+                if (!new_inode
+                    && new_dir->i_nlink >=
+                    (256 << sizeof(new_dir->i_nlink)) - 1)
                         goto end_rename;
         }
-        if (!nfi)
-        {
-                nfi = udf_add_entry(new_dir, new_dentry, &nfibh, &ncfi, &retval);
+        if (!nfi) {
+                nfi =
+                    udf_add_entry(new_dir, new_dentry, &nfibh, &ncfi, &retval);
                 if (!nfi)
                         goto end_rename;
         }
@@ -1257,39 +1234,33 @@ static int udf_rename (struct inode * old_dir, struct dentry * old_dentry,
         ofi = udf_find_entry(old_dir, old_dentry, &ofibh, &ocfi);
         udf_delete_entry(old_dir, ofi, &ofibh, &ocfi);
 
-        if (new_inode)
-        {
+        if (new_inode) {
                 new_inode->i_ctime = current_fs_time(new_inode->i_sb);
                 inode_dec_link_count(new_inode);
         }
         old_dir->i_ctime = old_dir->i_mtime = current_fs_time(old_dir->i_sb);
         mark_inode_dirty(old_dir);
 
-        if (dir_fi)
-        {
+        if (dir_fi) {
                 dir_fi->icb.extLocation = cpu_to_lelb(UDF_I_LOCATION(new_dir));
                 udf_update_tag((char *)dir_fi, (sizeof(struct fileIdentDesc) +
-                        le16_to_cpu(dir_fi->lengthOfImpUse) + 3) & ~3);
-                if (UDF_I_ALLOCTYPE(old_inode) == ICBTAG_FLAG_AD_IN_ICB)
-                {
+                                                le16_to_cpu(dir_fi->
+                                                            lengthOfImpUse) +
+                                                3) & ~3);
+                if (UDF_I_ALLOCTYPE(old_inode) == ICBTAG_FLAG_AD_IN_ICB) {
                         mark_inode_dirty(old_inode);
-                }
-                else
+                } else
                         mark_buffer_dirty_inode(dir_bh, old_inode);
                 inode_dec_link_count(old_dir);
-                if (new_inode)
-                {
+                if (new_inode) {
                         inode_dec_link_count(new_inode);
-                }
-                else
-                {
+                } else {
                         inc_nlink(new_dir);
                         mark_inode_dirty(new_dir);
                 }
         }
 
-        if (ofi)
-        {
+        if (ofi) {
                 if (ofibh.sbh != ofibh.ebh)
                         brelse(ofibh.ebh);
                 brelse(ofibh.sbh);
@@ -1297,10 +1268,9 @@ static int udf_rename (struct inode * old_dir, struct dentry * old_dentry,
 
         retval = 0;
 
-end_rename:
+      end_rename:
         brelse(dir_bh);
-        if (nfi)
-        {
+        if (nfi) {
                 if (nfibh.sbh != nfibh.ebh)
                         brelse(nfibh.ebh);
                 brelse(nfibh.sbh);
@@ -1310,13 +1280,13 @@ end_rename:
 }
 
 const struct inode_operations udf_dir_inode_operations = {
-        .lookup                         = udf_lookup,
-        .create                         = udf_create,
-        .link                           = udf_link,
-        .unlink                         = udf_unlink,
-        .symlink                        = udf_symlink,
-        .mkdir                          = udf_mkdir,
-        .rmdir                          = udf_rmdir,
-        .mknod                          = udf_mknod,
-        .rename                         = udf_rename,
+        .lookup = udf_lookup,
+        .create = udf_create,
+        .link = udf_link,
+        .unlink = udf_unlink,
+        .symlink = udf_symlink,
+        .mkdir = udf_mkdir,
+        .rmdir = udf_rmdir,
+        .mknod = udf_mknod,
+        .rename = udf_rename,
 };