diff options
| author | Valerie Aurora Henson <vaurora@redhat.com> | 2009-09-07 22:29:45 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-09-07 22:29:45 -0400 |
| commit | a63745e81cbb476b90c75ca3ca60b9ba4be95cae (patch) | |
| tree | b69b86f26b6173aaf0903f2d47cc27c0ccdb8c17 /misc | |
| parent | c5b7b6babe658a2037af6c9d2b7a3c23208f98f1 (diff) | |
| download | e2fsprogs-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 'misc')
| -rw-r--r-- | misc/e2image.c | 4 | ||||
| -rw-r--r-- | misc/tune2fs.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/misc/e2image.c b/misc/e2image.c index 24b9a1eb..abbf6410 100644 --- a/misc/e2image.c +++ b/misc/e2image.c @@ -511,9 +511,9 @@ static void write_raw_image_file(ext2_filsys fs, int fd, int scramble_flag) break; if (!inode.i_links_count) continue; - if (inode.i_file_acl) { + if (ext2fs_file_acl_block(&inode)) { ext2fs_mark_block_bitmap2(meta_block_map, - inode.i_file_acl); + ext2fs_file_acl_block(&inode)); } if (!ext2fs_inode_has_valid_blocks(&inode)) continue; diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 0911eb5c..6da5c072 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -1185,13 +1185,14 @@ static int inode_scan_and_fix(ext2_filsys fs, ext2fs_block_bitmap bmap) * Do we need to fix this ?? */ - if (inode.i_file_acl && - ext2fs_test_block_bitmap2(bmap, inode.i_file_acl)) { - blk = translate_block(inode.i_file_acl); + if (ext2fs_file_acl_block(&inode) && + ext2fs_test_block_bitmap2(bmap, + ext2fs_file_acl_block(&inode))) { + blk = translate_block(ext2fs_file_acl_block(&inode)); if (!blk) continue; - inode.i_file_acl = blk; + ext2fs_file_acl_block_set(&inode, blk); /* * Write the inode to disk so that inode table |