udf: remove UDF_I_* macros and open code them

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Acked-by: Jan Kara <jack@suse.cz>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 25 insertions, 25 deletions

diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
index 7697b489a292..5ed8cda1c53e 100644
--- a/fs/udf/ialloc.c
+++ b/fs/udf/ialloc.c
@@ -57,7 +57,7 @@ void udf_free_inode(struct inode *inode)
         }
         mutex_unlock(&sbi->s_alloc_mutex);
 
-        udf_free_blocks(sb, NULL, UDF_I_LOCATION(inode), 0, 1);
+        udf_free_blocks(sb, NULL, UDF_I(inode)->i_location, 0, 1);
 }
 
 struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
@@ -66,7 +66,7 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
         struct udf_sb_info *sbi = UDF_SB(sb);
         struct inode *inode;
         int block;
-        uint32_t start = UDF_I_LOCATION(dir).logicalBlockNum;
+        uint32_t start = UDF_I(dir)->i_location.logicalBlockNum;
 
         inode = new_inode(sb);
 
@@ -76,14 +76,14 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
         }
         *err = -ENOSPC;
 
-        UDF_I_UNIQUE(inode) = 0;
-        UDF_I_LENEXTENTS(inode) = 0;
-        UDF_I_NEXT_ALLOC_BLOCK(inode) = 0;
-        UDF_I_NEXT_ALLOC_GOAL(inode) = 0;
-        UDF_I_STRAT4096(inode) = 0;
+        UDF_I(inode)->i_unique = 0;
+        UDF_I(inode)->i_lenExtents = 0;
+        UDF_I(inode)->i_next_alloc_block = 0;
+        UDF_I(inode)->i_next_alloc_goal = 0;
+        UDF_I(inode)->i_strat4096 = 0;
 
         block = udf_new_block(dir->i_sb, NULL,
-                              UDF_I_LOCATION(dir).partitionReferenceNum,
+                              UDF_I(dir)->i_location.partitionReferenceNum,
                               start, err);
         if (*err) {
                 iput(inode);
@@ -107,7 +107,7 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
                 else
                         lvidiu->numFiles =
                                 cpu_to_le32(le32_to_cpu(lvidiu->numFiles) + 1);
-                UDF_I_UNIQUE(inode) = uniqueID = le64_to_cpu(lvhd->uniqueID);
+                UDF_I(inode)->i_unique = uniqueID = le64_to_cpu(lvhd->uniqueID);
                 if (!(++uniqueID & 0x00000000FFFFFFFFUL))
                         uniqueID += 16;
                 lvhd->uniqueID = cpu_to_le64(uniqueID);
@@ -123,41 +123,41 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
                 inode->i_gid = current->fsgid;
         }
 
-        UDF_I_LOCATION(inode).logicalBlockNum = block;
-        UDF_I_LOCATION(inode).partitionReferenceNum =
-                                UDF_I_LOCATION(dir).partitionReferenceNum;
-        inode->i_ino = udf_get_lb_pblock(sb, UDF_I_LOCATION(inode), 0);
+        UDF_I(inode)->i_location.logicalBlockNum = block;
+        UDF_I(inode)->i_location.partitionReferenceNum =
+                                UDF_I(dir)->i_location.partitionReferenceNum;
+        inode->i_ino = udf_get_lb_pblock(sb, UDF_I(inode)->i_location, 0);
         inode->i_blocks = 0;
-        UDF_I_LENEATTR(inode) = 0;
-        UDF_I_LENALLOC(inode) = 0;
-        UDF_I_USE(inode) = 0;
+        UDF_I(inode)->i_lenEAttr = 0;
+        UDF_I(inode)->i_lenAlloc = 0;
+        UDF_I(inode)->i_use = 0;
         if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_EXTENDED_FE)) {
-                UDF_I_EFE(inode) = 1;
+                UDF_I(inode)->i_efe = 1;
                 if (UDF_VERS_USE_EXTENDED_FE > sbi->s_udfrev)
                         sbi->s_udfrev = UDF_VERS_USE_EXTENDED_FE;
-                UDF_I_DATA(inode) = kzalloc(inode->i_sb->s_blocksize -
+                UDF_I(inode)->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize -
                                             sizeof(struct extendedFileEntry),
                                             GFP_KERNEL);
         } else {
-                UDF_I_EFE(inode) = 0;
-                UDF_I_DATA(inode) = kzalloc(inode->i_sb->s_blocksize -
+                UDF_I(inode)->i_efe = 0;
+                UDF_I(inode)->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize -
                                             sizeof(struct fileEntry),
                                             GFP_KERNEL);
         }
-        if (!UDF_I_DATA(inode)) {
+        if (!UDF_I(inode)->i_ext.i_data) {
                 iput(inode);
                 *err = -ENOMEM;
                 mutex_unlock(&sbi->s_alloc_mutex);
                 return NULL;
         }
         if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_AD_IN_ICB))
-                UDF_I_ALLOCTYPE(inode) = ICBTAG_FLAG_AD_IN_ICB;
+                UDF_I(inode)->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;
         else if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_SHORT_AD))
-                UDF_I_ALLOCTYPE(inode) = ICBTAG_FLAG_AD_SHORT;
+                UDF_I(inode)->i_alloc_type = ICBTAG_FLAG_AD_SHORT;
         else
-                UDF_I_ALLOCTYPE(inode) = ICBTAG_FLAG_AD_LONG;
+                UDF_I(inode)->i_alloc_type = ICBTAG_FLAG_AD_LONG;
         inode->i_mtime = inode->i_atime = inode->i_ctime =
-                UDF_I_CRTIME(inode) = current_fs_time(inode->i_sb);
+                UDF_I(inode)->i_crtime = current_fs_time(inode->i_sb);
         insert_inode_hash(inode);
         mark_inode_dirty(inode);
         mutex_unlock(&sbi->s_alloc_mutex);