[PATCH 03/24] udf: convert some macros to inline functions
macro UDF_SB_PARTMAPS -> function udf_sb_partmaps
macro UDF_SB_FREE -> function udf_sb_free
Signed-off-by: Marcin Slusarz <[EMAIL PROTECTED]>
CC: Ben Fennema <[EMAIL PROTECTED]>
CC: Jan Kara <[EMAIL PROTECTED]>
---
fs/udf/balloc.c | 24 ++--
fs/udf/super.c | 52 ++--
fs/udf/udf_sb.h | 65 +-
3 files changed, 73 insertions(+), 68 deletions(-)
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 8374c91..b5d09ae 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -792,19 +792,19 @@ inline void udf_free_blocks(struct super_block *sb,
if (UDF_SB_PARTFLAGS(sb, partition) & UDF_PART_FLAG_UNALLOC_BITMAP) {
return udf_bitmap_free_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_bitmap,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_bitmap,
bloc, offset, count);
} else if (UDF_SB_PARTFLAGS(sb, partition) &
UDF_PART_FLAG_UNALLOC_TABLE) {
return udf_table_free_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_table,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_table,
bloc, offset, count);
} else if (UDF_SB_PARTFLAGS(sb, partition) &
UDF_PART_FLAG_FREED_BITMAP) {
return udf_bitmap_free_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_fspace.s_bitmap,
+
udf_sb_partmaps(sb)[partition].s_fspace.s_bitmap,
bloc, offset, count);
} else if (UDF_SB_PARTFLAGS(sb, partition) & UDF_PART_FLAG_FREED_TABLE)
{
return udf_table_free_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_fspace.s_table,
+
udf_sb_partmaps(sb)[partition].s_fspace.s_table,
bloc, offset, count);
} else {
return;
@@ -818,19 +818,19 @@ inline int udf_prealloc_blocks(struct super_block *sb,
{
if (UDF_SB_PARTFLAGS(sb, partition) & UDF_PART_FLAG_UNALLOC_BITMAP) {
return udf_bitmap_prealloc_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_bitmap,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_bitmap,
partition, first_block,
block_count);
} else if (UDF_SB_PARTFLAGS(sb, partition) &
UDF_PART_FLAG_UNALLOC_TABLE) {
return udf_table_prealloc_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_table,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_table,
partition, first_block,
block_count);
} else if (UDF_SB_PARTFLAGS(sb, partition) &
UDF_PART_FLAG_FREED_BITMAP) {
return udf_bitmap_prealloc_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_fspace.s_bitmap,
+
udf_sb_partmaps(sb)[partition].s_fspace.s_bitmap,
partition, first_block,
block_count);
} else if (UDF_SB_PARTFLAGS(sb, partition) & UDF_PART_FLAG_FREED_TABLE)
{
return udf_table_prealloc_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_fspace.s_table,
+
udf_sb_partmaps(sb)[partition].s_fspace.s_table,
partition, first_block,
block_count);
} else {
return 0;
@@ -845,20 +845,20 @@ inline int udf_new_block(struct super_block *sb,
if (UDF_SB_PARTFLAGS(sb, partition) & UDF_PART_FLAG_UNALLOC_BITMAP) {
ret = udf_bitmap_new_block(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_bitmap,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_bitmap,
partition, goal, err);
return ret;
} else if (UDF_SB_PARTFLAGS(sb, partition) &
UDF_PART_FLAG_UNALLOC_TABLE) {
return udf_table_new_block(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_table,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_table,
[PATCH 03/24] udf: convert some macros to inline functions
macro UDF_SB_PARTMAPS - function udf_sb_partmaps
macro UDF_SB_FREE - function udf_sb_free
Signed-off-by: Marcin Slusarz [EMAIL PROTECTED]
CC: Ben Fennema [EMAIL PROTECTED]
CC: Jan Kara [EMAIL PROTECTED]
---
fs/udf/balloc.c | 24 ++--
fs/udf/super.c | 52 ++--
fs/udf/udf_sb.h | 65 +-
3 files changed, 73 insertions(+), 68 deletions(-)
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 8374c91..b5d09ae 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -792,19 +792,19 @@ inline void udf_free_blocks(struct super_block *sb,
if (UDF_SB_PARTFLAGS(sb, partition) UDF_PART_FLAG_UNALLOC_BITMAP) {
return udf_bitmap_free_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_bitmap,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_bitmap,
bloc, offset, count);
} else if (UDF_SB_PARTFLAGS(sb, partition)
UDF_PART_FLAG_UNALLOC_TABLE) {
return udf_table_free_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_table,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_table,
bloc, offset, count);
} else if (UDF_SB_PARTFLAGS(sb, partition)
UDF_PART_FLAG_FREED_BITMAP) {
return udf_bitmap_free_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_fspace.s_bitmap,
+
udf_sb_partmaps(sb)[partition].s_fspace.s_bitmap,
bloc, offset, count);
} else if (UDF_SB_PARTFLAGS(sb, partition) UDF_PART_FLAG_FREED_TABLE)
{
return udf_table_free_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_fspace.s_table,
+
udf_sb_partmaps(sb)[partition].s_fspace.s_table,
bloc, offset, count);
} else {
return;
@@ -818,19 +818,19 @@ inline int udf_prealloc_blocks(struct super_block *sb,
{
if (UDF_SB_PARTFLAGS(sb, partition) UDF_PART_FLAG_UNALLOC_BITMAP) {
return udf_bitmap_prealloc_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_bitmap,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_bitmap,
partition, first_block,
block_count);
} else if (UDF_SB_PARTFLAGS(sb, partition)
UDF_PART_FLAG_UNALLOC_TABLE) {
return udf_table_prealloc_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_table,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_table,
partition, first_block,
block_count);
} else if (UDF_SB_PARTFLAGS(sb, partition)
UDF_PART_FLAG_FREED_BITMAP) {
return udf_bitmap_prealloc_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_fspace.s_bitmap,
+
udf_sb_partmaps(sb)[partition].s_fspace.s_bitmap,
partition, first_block,
block_count);
} else if (UDF_SB_PARTFLAGS(sb, partition) UDF_PART_FLAG_FREED_TABLE)
{
return udf_table_prealloc_blocks(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_fspace.s_table,
+
udf_sb_partmaps(sb)[partition].s_fspace.s_table,
partition, first_block,
block_count);
} else {
return 0;
@@ -845,20 +845,20 @@ inline int udf_new_block(struct super_block *sb,
if (UDF_SB_PARTFLAGS(sb, partition) UDF_PART_FLAG_UNALLOC_BITMAP) {
ret = udf_bitmap_new_block(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_bitmap,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_bitmap,
partition, goal, err);
return ret;
} else if (UDF_SB_PARTFLAGS(sb, partition)
UDF_PART_FLAG_UNALLOC_TABLE) {
return udf_table_new_block(sb, inode,
-
UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_table,
+
udf_sb_partmaps(sb)[partition].s_uspace.s_table,
partition, goal,
