summaryrefslogtreecommitdiffstats
path: root/fs/ntfs3/record.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ntfs3/record.c')
-rw-r--r--fs/ntfs3/record.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ntfs3/record.c b/fs/ntfs3/record.c
index 0d4a6251bddc..721c14f83e2b 100644
--- a/fs/ntfs3/record.c
+++ b/fs/ntfs3/record.c
@@ -206,7 +206,7 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)
return NULL;
if (off >= used || off < MFTRECORD_FIXUP_OFFSET_1 ||
- !IsDwordAligned(off)) {
+ !IS_ALIGNED(off, 4)) {
return NULL;
}
@@ -235,7 +235,7 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)
/* Can we use the first field (attr->type) */
if (off + 8 > used) {
- static_assert(QuadAlign(sizeof(enum ATTR_TYPE)) == 8);
+ static_assert(ALIGN(sizeof(enum ATTR_TYPE), 8) == 8);
return NULL;
}
@@ -539,7 +539,7 @@ bool mi_resize_attr(struct mft_inode *mi, struct ATTRIB *attr, int bytes)
next = Add2Ptr(attr, asize);
if (bytes > 0) {
- dsize = QuadAlign(bytes);
+ dsize = ALIGN(bytes, 8);
if (used + dsize > total)
return false;
nsize = asize + dsize;
@@ -549,7 +549,7 @@ bool mi_resize_attr(struct mft_inode *mi, struct ATTRIB *attr, int bytes)
used += dsize;
rsize += dsize;
} else {
- dsize = QuadAlign(-bytes);
+ dsize = ALIGN(-bytes, 8);
if (dsize > asize)
return false;
nsize = asize - dsize;
@@ -596,7 +596,7 @@ int mi_pack_runs(struct mft_inode *mi, struct ATTRIB *attr,
return err;
}
- new_run_size = QuadAlign(err);
+ new_run_size = ALIGN(err, 8);
memmove(next + new_run_size - run_size, next + dsize, tail);