|
@@ -29,7 +29,7 @@
|
|
|
|
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/types.h>
|
|
|
#include <linux/magic.h>
|
|
#include <linux/magic.h>
|
|
|
-
|
|
|
|
|
|
|
+#include <asm/byteorder.h>
|
|
|
|
|
|
|
|
#define NILFS_INODE_BMAP_SIZE 7
|
|
#define NILFS_INODE_BMAP_SIZE 7
|
|
|
|
|
|
|
@@ -533,19 +533,19 @@ enum {
|
|
|
static inline void \
|
|
static inline void \
|
|
|
nilfs_checkpoint_set_##name(struct nilfs_checkpoint *cp) \
|
|
nilfs_checkpoint_set_##name(struct nilfs_checkpoint *cp) \
|
|
|
{ \
|
|
{ \
|
|
|
- cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) | \
|
|
|
|
|
- (1UL << NILFS_CHECKPOINT_##flag)); \
|
|
|
|
|
|
|
+ cp->cp_flags = __cpu_to_le32(__le32_to_cpu(cp->cp_flags) | \
|
|
|
|
|
+ (1UL << NILFS_CHECKPOINT_##flag)); \
|
|
|
} \
|
|
} \
|
|
|
static inline void \
|
|
static inline void \
|
|
|
nilfs_checkpoint_clear_##name(struct nilfs_checkpoint *cp) \
|
|
nilfs_checkpoint_clear_##name(struct nilfs_checkpoint *cp) \
|
|
|
{ \
|
|
{ \
|
|
|
- cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) & \
|
|
|
|
|
|
|
+ cp->cp_flags = __cpu_to_le32(__le32_to_cpu(cp->cp_flags) & \
|
|
|
~(1UL << NILFS_CHECKPOINT_##flag)); \
|
|
~(1UL << NILFS_CHECKPOINT_##flag)); \
|
|
|
} \
|
|
} \
|
|
|
static inline int \
|
|
static inline int \
|
|
|
nilfs_checkpoint_##name(const struct nilfs_checkpoint *cp) \
|
|
nilfs_checkpoint_##name(const struct nilfs_checkpoint *cp) \
|
|
|
{ \
|
|
{ \
|
|
|
- return !!(le32_to_cpu(cp->cp_flags) & \
|
|
|
|
|
|
|
+ return !!(__le32_to_cpu(cp->cp_flags) & \
|
|
|
(1UL << NILFS_CHECKPOINT_##flag)); \
|
|
(1UL << NILFS_CHECKPOINT_##flag)); \
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -595,20 +595,20 @@ enum {
|
|
|
static inline void \
|
|
static inline void \
|
|
|
nilfs_segment_usage_set_##name(struct nilfs_segment_usage *su) \
|
|
nilfs_segment_usage_set_##name(struct nilfs_segment_usage *su) \
|
|
|
{ \
|
|
{ \
|
|
|
- su->su_flags = cpu_to_le32(le32_to_cpu(su->su_flags) | \
|
|
|
|
|
|
|
+ su->su_flags = __cpu_to_le32(__le32_to_cpu(su->su_flags) | \
|
|
|
(1UL << NILFS_SEGMENT_USAGE_##flag));\
|
|
(1UL << NILFS_SEGMENT_USAGE_##flag));\
|
|
|
} \
|
|
} \
|
|
|
static inline void \
|
|
static inline void \
|
|
|
nilfs_segment_usage_clear_##name(struct nilfs_segment_usage *su) \
|
|
nilfs_segment_usage_clear_##name(struct nilfs_segment_usage *su) \
|
|
|
{ \
|
|
{ \
|
|
|
su->su_flags = \
|
|
su->su_flags = \
|
|
|
- cpu_to_le32(le32_to_cpu(su->su_flags) & \
|
|
|
|
|
|
|
+ __cpu_to_le32(__le32_to_cpu(su->su_flags) & \
|
|
|
~(1UL << NILFS_SEGMENT_USAGE_##flag)); \
|
|
~(1UL << NILFS_SEGMENT_USAGE_##flag)); \
|
|
|
} \
|
|
} \
|
|
|
static inline int \
|
|
static inline int \
|
|
|
nilfs_segment_usage_##name(const struct nilfs_segment_usage *su) \
|
|
nilfs_segment_usage_##name(const struct nilfs_segment_usage *su) \
|
|
|
{ \
|
|
{ \
|
|
|
- return !!(le32_to_cpu(su->su_flags) & \
|
|
|
|
|
|
|
+ return !!(__le32_to_cpu(su->su_flags) & \
|
|
|
(1UL << NILFS_SEGMENT_USAGE_##flag)); \
|
|
(1UL << NILFS_SEGMENT_USAGE_##flag)); \
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -619,15 +619,15 @@ NILFS_SEGMENT_USAGE_FNS(ERROR, error)
|
|
|
static inline void
|
|
static inline void
|
|
|
nilfs_segment_usage_set_clean(struct nilfs_segment_usage *su)
|
|
nilfs_segment_usage_set_clean(struct nilfs_segment_usage *su)
|
|
|
{
|
|
{
|
|
|
- su->su_lastmod = cpu_to_le64(0);
|
|
|
|
|
- su->su_nblocks = cpu_to_le32(0);
|
|
|
|
|
- su->su_flags = cpu_to_le32(0);
|
|
|
|
|
|
|
+ su->su_lastmod = __cpu_to_le64(0);
|
|
|
|
|
+ su->su_nblocks = __cpu_to_le32(0);
|
|
|
|
|
+ su->su_flags = __cpu_to_le32(0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static inline int
|
|
static inline int
|
|
|
nilfs_segment_usage_clean(const struct nilfs_segment_usage *su)
|
|
nilfs_segment_usage_clean(const struct nilfs_segment_usage *su)
|
|
|
{
|
|
{
|
|
|
- return !le32_to_cpu(su->su_flags);
|
|
|
|
|
|
|
+ return !__le32_to_cpu(su->su_flags);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|