diff options
Diffstat (limited to 'e2fsprogs/ext2fs/bmove.c')
-rw-r--r-- | e2fsprogs/ext2fs/bmove.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/e2fsprogs/ext2fs/bmove.c b/e2fsprogs/ext2fs/bmove.c index 0b2ebb183..fb319f8c3 100644 --- a/e2fsprogs/ext2fs/bmove.c +++ b/e2fsprogs/ext2fs/bmove.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * bmove.c --- Move blocks around to make way for a particular | 2 | * bmove.c --- Move blocks around to make way for a particular |
3 | * filesystem structure. | 3 | * filesystem structure. |
4 | * | 4 | * |
5 | * Copyright (C) 1997 Theodore Ts'o. This file may be redistributed | 5 | * Copyright (C) 1997 Theodore Ts'o. This file may be redistributed |
6 | * under the terms of the GNU Public License. | 6 | * under the terms of the GNU Public License. |
@@ -44,7 +44,7 @@ static int process_block(ext2_filsys fs, blk_t *block_nr, | |||
44 | pb = (struct process_block_struct *) priv_data; | 44 | pb = (struct process_block_struct *) priv_data; |
45 | block = orig = *block_nr; | 45 | block = orig = *block_nr; |
46 | ret = 0; | 46 | ret = 0; |
47 | 47 | ||
48 | /* | 48 | /* |
49 | * Let's see if this is one which we need to relocate | 49 | * Let's see if this is one which we need to relocate |
50 | */ | 50 | */ |
@@ -98,7 +98,7 @@ errcode_t ext2fs_move_blocks(ext2_filsys fs, | |||
98 | struct process_block_struct pb; | 98 | struct process_block_struct pb; |
99 | ext2_inode_scan scan; | 99 | ext2_inode_scan scan; |
100 | char *block_buf; | 100 | char *block_buf; |
101 | 101 | ||
102 | retval = ext2fs_open_inode_scan(fs, 0, &scan); | 102 | retval = ext2fs_open_inode_scan(fs, 0, &scan); |
103 | if (retval) | 103 | if (retval) |
104 | return retval; | 104 | return retval; |
@@ -107,7 +107,7 @@ errcode_t ext2fs_move_blocks(ext2_filsys fs, | |||
107 | pb.error = 0; | 107 | pb.error = 0; |
108 | pb.alloc_map = alloc_map ? alloc_map : fs->block_map; | 108 | pb.alloc_map = alloc_map ? alloc_map : fs->block_map; |
109 | pb.flags = flags; | 109 | pb.flags = flags; |
110 | 110 | ||
111 | retval = ext2fs_get_mem(fs->blocksize * 4, &block_buf); | 111 | retval = ext2fs_get_mem(fs->blocksize * 4, &block_buf); |
112 | if (retval) | 112 | if (retval) |
113 | return retval; | 113 | return retval; |
@@ -131,12 +131,12 @@ errcode_t ext2fs_move_blocks(ext2_filsys fs, | |||
131 | retval = ext2fs_get_next_inode(scan, &ino, &inode); | 131 | retval = ext2fs_get_next_inode(scan, &ino, &inode); |
132 | if (retval) | 132 | if (retval) |
133 | return retval; | 133 | return retval; |
134 | 134 | ||
135 | while (ino) { | 135 | while (ino) { |
136 | if ((inode.i_links_count == 0) || | 136 | if ((inode.i_links_count == 0) || |
137 | !ext2fs_inode_has_valid_blocks(&inode)) | 137 | !ext2fs_inode_has_valid_blocks(&inode)) |
138 | goto next; | 138 | goto next; |
139 | 139 | ||
140 | pb.ino = ino; | 140 | pb.ino = ino; |
141 | pb.inode = &inode; | 141 | pb.inode = &inode; |
142 | 142 | ||