2007-12-25 14:51:22

by Marcin Slusarz

[permalink] [raw]
Subject: [PATCH] ocfs2: convert byte order of constant instead of variable

convert byte order of constant instead of variable
it will be done at compile time (vs run time)
remove unused le32_and_cpu

Signed-off-by: Marcin Slusarz <[email protected]>
CC: Mark Fasheh <[email protected]>
CC: Kurt Hackel <[email protected]>
---
fs/ocfs2/endian.h | 5 -----
fs/ocfs2/inode.c | 2 +-
2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/fs/ocfs2/endian.h b/fs/ocfs2/endian.h
index ff25762..1942e09 100644
--- a/fs/ocfs2/endian.h
+++ b/fs/ocfs2/endian.h
@@ -37,11 +37,6 @@ static inline void le64_add_cpu(__le64 *var, u64 val)
*var = cpu_to_le64(le64_to_cpu(*var) + val);
}

-static inline void le32_and_cpu(__le32 *var, u32 val)
-{
- *var = cpu_to_le32(le32_to_cpu(*var) & val);
-}
-
static inline void be32_add_cpu(__be32 *var, u32 val)
{
*var = cpu_to_be32(be32_to_cpu(*var) + val);
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index ebb2bbe..ccea366 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -617,7 +617,7 @@ static int ocfs2_remove_inode(struct inode *inode,
}

di->i_dtime = cpu_to_le64(CURRENT_TIME.tv_sec);
- le32_and_cpu(&di->i_flags, ~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL));
+ di->i_flags &= cpu_to_le32(~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL));

status = ocfs2_journal_dirty(handle, di_bh);
if (status < 0) {
--
1.5.3.4


2007-12-31 19:37:11

by Mark Fasheh

[permalink] [raw]
Subject: Re: [PATCH] ocfs2: convert byte order of constant instead of variable

On Tue, Dec 25, 2007 at 03:52:59PM +0100, Marcin Slusarz wrote:
> convert byte order of constant instead of variable
> it will be done at compile time (vs run time)
> remove unused le32_and_cpu

Ok, this looks good. I'll put it in ocfs2.git later today.
--Mark

--
Mark Fasheh
Principal Software Developer, Oracle
[email protected]