summaryrefslogtreecommitdiff
path: root/e2fsck/super.c
diff options
context:
space:
mode:
authorValerie Aurora Henson <vaurora@redhat.com>2009-09-07 22:29:45 -0400
committerTheodore Ts'o <tytso@mit.edu>2009-09-07 22:29:45 -0400
commita63745e81cbb476b90c75ca3ca60b9ba4be95cae (patch)
treeb69b86f26b6173aaf0903f2d47cc27c0ccdb8c17 /e2fsck/super.c
parentc5b7b6babe658a2037af6c9d2b7a3c23208f98f1 (diff)
downloade2fsprogs-a63745e81cbb476b90c75ca3ca60b9ba4be95cae.tar.gz
Use ext2fs_file_acl_block() instead of using .i_file_acl directly
This provides support for 48-bit file acl blocks. Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'e2fsck/super.c')
-rw-r--r--e2fsck/super.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/e2fsck/super.c b/e2fsck/super.c
index 2d5d6615..6b08688a 100644
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -197,8 +197,8 @@ static int release_inode_blocks(e2fsck_t ctx, ext2_ino_t ino,
if (pb.truncated_blocks)
ext2fs_iblk_sub_blocks(fs, inode, pb.truncated_blocks);
- if (inode->i_file_acl) {
- retval = ext2fs_adjust_ea_refcount(fs, inode->i_file_acl,
+ if (ext2fs_file_acl_block(inode)) {
+ retval = ext2fs_adjust_ea_refcount(fs, ext2fs_file_acl_block(inode),
block_buf, -1, &count);
if (retval == EXT2_ET_BAD_EA_BLOCK_NUM) {
retval = 0;
@@ -211,8 +211,10 @@ static int release_inode_blocks(e2fsck_t ctx, ext2_ino_t ino,
return 1;
}
if (count == 0)
- ext2fs_block_alloc_stats(fs, inode->i_file_acl, -1);
- inode->i_file_acl = 0;
+ ext2fs_block_alloc_stats(fs,
+ ext2fs_file_acl_block(inode),
+ -1);
+ ext2fs_file_acl_block_set(inode, 0);
}
return 0;
}