diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2007-12-25 15:52:59 +0100 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2008-01-25 15:05:46 -0800 |
| commit | 4092d49f705aa19750c39758fa1be767e162c48d (patch) | |
| tree | 190a48395331e62d0d1f5222b3a8e763ef70e18e /fs/ocfs2 | |
| parent | 17104683d262fc6ab58488c4a3f0415012acc636 (diff) | |
| download | talos-op-linux-4092d49f705aa19750c39758fa1be767e162c48d.tar.gz talos-op-linux-4092d49f705aa19750c39758fa1be767e162c48d.zip | |
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 <marcin.slusarz@gmail.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/endian.h | 5 | ||||
| -rw-r--r-- | 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 ff257628af16..1942e09f6ee5 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 5e19c119183d..7e9e4c79aec7 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -620,7 +620,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) { |
