[PATCH 12/24] udf: convert UDF_SB_LVIDIU macro to udf_sb_lvidiu function
Signed-off-by: Marcin Slusarz <[EMAIL PROTECTED]>
CC: Ben Fennema <[EMAIL PROTECTED]>
CC: Jan Kara <[EMAIL PROTECTED]>
---
fs/udf/ialloc.c | 16
fs/udf/super.c | 34 +-
fs/udf/udf_sb.h | 10 --
3 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
index ddbf1e6..269f588 100644
--- a/fs/udf/ialloc.c
+++ b/fs/udf/ialloc.c
@@ -45,11 +45,11 @@ void udf_free_inode(struct inode *inode)
mutex_lock(>s_alloc_mutex);
if (sbi->s_lvid_bh) {
if (S_ISDIR(inode->i_mode))
- UDF_SB_LVIDIU(sb)->numDirs =
-
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numDirs) - 1);
+ udf_sb_lvidiu(sb)->numDirs =
+
cpu_to_le32(le32_to_cpu(udf_sb_lvidiu(sb)->numDirs) - 1);
else
- UDF_SB_LVIDIU(sb)->numFiles =
-
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numFiles) - 1);
+ udf_sb_lvidiu(sb)->numFiles =
+
cpu_to_le32(le32_to_cpu(udf_sb_lvidiu(sb)->numFiles) - 1);
mark_buffer_dirty(sbi->s_lvid_bh);
}
@@ -93,11 +93,11 @@ struct inode *udf_new_inode(struct inode *dir, int mode,
int *err)
uint64_t uniqueID;
lvhd = (struct logicalVolHeaderDesc
*)(udf_sb_lvid(sb)->logicalVolContentsUse);
if (S_ISDIR(mode))
- UDF_SB_LVIDIU(sb)->numDirs =
-
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numDirs) + 1);
+ udf_sb_lvidiu(sb)->numDirs =
+
cpu_to_le32(le32_to_cpu(udf_sb_lvidiu(sb)->numDirs) + 1);
else
- UDF_SB_LVIDIU(sb)->numFiles =
-
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numFiles) + 1);
+ udf_sb_lvidiu(sb)->numFiles =
+
cpu_to_le32(le32_to_cpu(udf_sb_lvidiu(sb)->numFiles) + 1);
UDF_I_UNIQUE(inode) = uniqueID = le64_to_cpu(lvhd->uniqueID);
if (!(++uniqueID & 0xUL))
uniqueID += 16;
diff --git a/fs/udf/super.c b/fs/udf/super.c
index f9109c5..6c14c4d 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -476,7 +476,7 @@ static int udf_remount_fs(struct super_block *sb, int
*flags, char *options)
udf_sb(sb)->s_umask = uopt.umask;
if (udf_sb_lvid_bh(sb)) {
- int write_rev = le16_to_cpu(UDF_SB_LVIDIU(sb)->minUDFWriteRev);
+ int write_rev = le16_to_cpu(udf_sb_lvidiu(sb)->minUDFWriteRev);
if (write_rev > UDF_MAX_WRITE_VERSION)
*flags |= MS_RDONLY;
}
@@ -1381,8 +1381,8 @@ static void udf_open_lvid(struct super_block *sb)
int i;
kernel_timestamp cpu_time;
- UDF_SB_LVIDIU(sb)->impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;
- UDF_SB_LVIDIU(sb)->impIdent.identSuffix[1] = UDF_OS_ID_LINUX;
+ udf_sb_lvidiu(sb)->impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;
+ udf_sb_lvidiu(sb)->impIdent.identSuffix[1] = UDF_OS_ID_LINUX;
if (udf_time_to_stamp(_time, CURRENT_TIME))
udf_sb_lvid(sb)->recordingDateAndTime =
cpu_to_lets(cpu_time);
udf_sb_lvid(sb)->integrityType = LVID_INTEGRITY_TYPE_OPEN;
@@ -1407,16 +1407,16 @@ static void udf_close_lvid(struct super_block *sb)
if (udf_sb_lvid_bh(sb) &&
udf_sb_lvid(sb)->integrityType == LVID_INTEGRITY_TYPE_OPEN) {
- UDF_SB_LVIDIU(sb)->impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;
- UDF_SB_LVIDIU(sb)->impIdent.identSuffix[1] = UDF_OS_ID_LINUX;
+ udf_sb_lvidiu(sb)->impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;
+ udf_sb_lvidiu(sb)->impIdent.identSuffix[1] = UDF_OS_ID_LINUX;
if (udf_time_to_stamp(_time, CURRENT_TIME))
udf_sb_lvid(sb)->recordingDateAndTime =
cpu_to_lets(cpu_time);
- if (UDF_MAX_WRITE_VERSION >
le16_to_cpu(UDF_SB_LVIDIU(sb)->maxUDFWriteRev))
- UDF_SB_LVIDIU(sb)->maxUDFWriteRev =
cpu_to_le16(UDF_MAX_WRITE_VERSION);
- if (UDF_SB_UDFREV(sb) >
le16_to_cpu(UDF_SB_LVIDIU(sb)->minUDFReadRev))
- UDF_SB_LVIDIU(sb)->minUDFReadRev =
cpu_to_le16(UDF_SB_UDFREV(sb));
- if (UDF_SB_UDFREV(sb) >
le16_to_cpu(UDF_SB_LVIDIU(sb)->minUDFWriteRev))
- UDF_SB_LVIDIU(sb)->minUDFWriteRev =
cpu_to_le16(UDF_SB_UDFREV(sb));
+ if (UDF_MAX_WRITE_VERSION >
le16_to_cpu(udf_sb_lvidiu(sb)->maxUDFWriteRev))
+ udf_sb_lvidiu(sb)->maxUDFWriteRev =
cpu_to_le16(UDF_MAX_WRITE_VERSION);
+ if (UDF_SB_UDFREV(sb) >
[PATCH 12/24] udf: convert UDF_SB_LVIDIU macro to udf_sb_lvidiu function
Signed-off-by: Marcin Slusarz [EMAIL PROTECTED]
CC: Ben Fennema [EMAIL PROTECTED]
CC: Jan Kara [EMAIL PROTECTED]
---
fs/udf/ialloc.c | 16
fs/udf/super.c | 34 +-
fs/udf/udf_sb.h | 10 --
3 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
index ddbf1e6..269f588 100644
--- a/fs/udf/ialloc.c
+++ b/fs/udf/ialloc.c
@@ -45,11 +45,11 @@ void udf_free_inode(struct inode *inode)
mutex_lock(sbi-s_alloc_mutex);
if (sbi-s_lvid_bh) {
if (S_ISDIR(inode-i_mode))
- UDF_SB_LVIDIU(sb)-numDirs =
-
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)-numDirs) - 1);
+ udf_sb_lvidiu(sb)-numDirs =
+
cpu_to_le32(le32_to_cpu(udf_sb_lvidiu(sb)-numDirs) - 1);
else
- UDF_SB_LVIDIU(sb)-numFiles =
-
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)-numFiles) - 1);
+ udf_sb_lvidiu(sb)-numFiles =
+
cpu_to_le32(le32_to_cpu(udf_sb_lvidiu(sb)-numFiles) - 1);
mark_buffer_dirty(sbi-s_lvid_bh);
}
@@ -93,11 +93,11 @@ struct inode *udf_new_inode(struct inode *dir, int mode,
int *err)
uint64_t uniqueID;
lvhd = (struct logicalVolHeaderDesc
*)(udf_sb_lvid(sb)-logicalVolContentsUse);
if (S_ISDIR(mode))
- UDF_SB_LVIDIU(sb)-numDirs =
-
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)-numDirs) + 1);
+ udf_sb_lvidiu(sb)-numDirs =
+
cpu_to_le32(le32_to_cpu(udf_sb_lvidiu(sb)-numDirs) + 1);
else
- UDF_SB_LVIDIU(sb)-numFiles =
-
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)-numFiles) + 1);
+ udf_sb_lvidiu(sb)-numFiles =
+
cpu_to_le32(le32_to_cpu(udf_sb_lvidiu(sb)-numFiles) + 1);
UDF_I_UNIQUE(inode) = uniqueID = le64_to_cpu(lvhd-uniqueID);
if (!(++uniqueID 0xUL))
uniqueID += 16;
diff --git a/fs/udf/super.c b/fs/udf/super.c
index f9109c5..6c14c4d 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -476,7 +476,7 @@ static int udf_remount_fs(struct super_block *sb, int
*flags, char *options)
udf_sb(sb)-s_umask = uopt.umask;
if (udf_sb_lvid_bh(sb)) {
- int write_rev = le16_to_cpu(UDF_SB_LVIDIU(sb)-minUDFWriteRev);
+ int write_rev = le16_to_cpu(udf_sb_lvidiu(sb)-minUDFWriteRev);
if (write_rev UDF_MAX_WRITE_VERSION)
*flags |= MS_RDONLY;
}
@@ -1381,8 +1381,8 @@ static void udf_open_lvid(struct super_block *sb)
int i;
kernel_timestamp cpu_time;
- UDF_SB_LVIDIU(sb)-impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;
- UDF_SB_LVIDIU(sb)-impIdent.identSuffix[1] = UDF_OS_ID_LINUX;
+ udf_sb_lvidiu(sb)-impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;
+ udf_sb_lvidiu(sb)-impIdent.identSuffix[1] = UDF_OS_ID_LINUX;
if (udf_time_to_stamp(cpu_time, CURRENT_TIME))
udf_sb_lvid(sb)-recordingDateAndTime =
cpu_to_lets(cpu_time);
udf_sb_lvid(sb)-integrityType = LVID_INTEGRITY_TYPE_OPEN;
@@ -1407,16 +1407,16 @@ static void udf_close_lvid(struct super_block *sb)
if (udf_sb_lvid_bh(sb)
udf_sb_lvid(sb)-integrityType == LVID_INTEGRITY_TYPE_OPEN) {
- UDF_SB_LVIDIU(sb)-impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;
- UDF_SB_LVIDIU(sb)-impIdent.identSuffix[1] = UDF_OS_ID_LINUX;
+ udf_sb_lvidiu(sb)-impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;
+ udf_sb_lvidiu(sb)-impIdent.identSuffix[1] = UDF_OS_ID_LINUX;
if (udf_time_to_stamp(cpu_time, CURRENT_TIME))
udf_sb_lvid(sb)-recordingDateAndTime =
cpu_to_lets(cpu_time);
- if (UDF_MAX_WRITE_VERSION
le16_to_cpu(UDF_SB_LVIDIU(sb)-maxUDFWriteRev))
- UDF_SB_LVIDIU(sb)-maxUDFWriteRev =
cpu_to_le16(UDF_MAX_WRITE_VERSION);
- if (UDF_SB_UDFREV(sb)
le16_to_cpu(UDF_SB_LVIDIU(sb)-minUDFReadRev))
- UDF_SB_LVIDIU(sb)-minUDFReadRev =
cpu_to_le16(UDF_SB_UDFREV(sb));
- if (UDF_SB_UDFREV(sb)
le16_to_cpu(UDF_SB_LVIDIU(sb)-minUDFWriteRev))
- UDF_SB_LVIDIU(sb)-minUDFWriteRev =
cpu_to_le16(UDF_SB_UDFREV(sb));
+ if (UDF_MAX_WRITE_VERSION
le16_to_cpu(udf_sb_lvidiu(sb)-maxUDFWriteRev))
+ udf_sb_lvidiu(sb)-maxUDFWriteRev =
cpu_to_le16(UDF_MAX_WRITE_VERSION);
+ if (UDF_SB_UDFREV(sb)
le16_to_cpu(udf_sb_lvidiu(sb)-minUDFReadRev))
+
