diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2006-12-02 11:55:45 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2006-12-02 11:55:45 +0000 |
| commit | 9be0db0654c75271c46d7cdcc6ac8ef4a460b8fb (patch) | |
| tree | ff1bdcffba37214f8735252d1697a4a6893c5e86 /sys-fs/evms/files/2.5.5/ntfs_unmkfs.patch | |
| parent | fix bugs, implement suggestions from vapier (diff) | |
| download | gentoo-2-9be0db0654c75271c46d7cdcc6ac8ef4a460b8fb.tar.gz gentoo-2-9be0db0654c75271c46d7cdcc6ac8ef4a460b8fb.tar.bz2 gentoo-2-9be0db0654c75271c46d7cdcc6ac8ef4a460b8fb.zip | |
Revision bump to include new upstream patches. Included the glib-patch provided by Jimmy Jazz (bug #152293) and the ocfs2-patch (bug #147276, thanks to Brad Plant). Solved bug #147281 and #154924. Dropped old version.
(Portage version: 2.1.2_rc2)
Diffstat (limited to 'sys-fs/evms/files/2.5.5/ntfs_unmkfs.patch')
| -rw-r--r-- | sys-fs/evms/files/2.5.5/ntfs_unmkfs.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/sys-fs/evms/files/2.5.5/ntfs_unmkfs.patch b/sys-fs/evms/files/2.5.5/ntfs_unmkfs.patch new file mode 100644 index 000000000000..6e62c28eb5d3 --- /dev/null +++ b/sys-fs/evms/files/2.5.5/ntfs_unmkfs.patch @@ -0,0 +1,33 @@ +This patch fixes a bug in the NTFS unmkfs. The offsets for the superblocks +were calculated incorrectly by using the filesystem size rather than using +the volume size. The result is that sometimes the superblocks didn't get +wiped out, leaving the NTFS file system still on the volume. + +--- evms-2.5.5/plugins/ntfs/utils.c 2006-02-24 10:36:54.000000000 -0600 ++++ evms-2.5.5-fix/plugins/ntfs/utils.c 2006-05-04 16:47:26.243120000 -0500 +@@ -313,7 +313,6 @@ + int clear_ntfs_boot_sectors(logical_volume_t * ev) + { + int rc = 0; +- private_data_t * pd = (private_data_t *) ev->private_data; + int fd; + void * block; + int32_t bytes_written; +@@ -346,7 +345,7 @@ + } + + /* Wipe out the NT4+ backup boot sector. */ +- bytes_written = EngFncs->write_volume(ev, fd, block, NTFS_BLOCK_SIZE, (pd->fs_size << EVMS_VSECTOR_SIZE_SHIFT) - NTFS_BLOCK_SIZE); ++ bytes_written = EngFncs->write_volume(ev, fd, block, NTFS_BLOCK_SIZE, (ev->vol_size << EVMS_VSECTOR_SIZE_SHIFT) - NTFS_BLOCK_SIZE); + if (bytes_written != NTFS_BLOCK_SIZE) { + LOG_WARNING("Failed to clear the primary boot sector on volume %s. " + "Only %d bytes were written.\n", +@@ -355,7 +354,7 @@ + } + + /* Wipe out the NT3.51- backup boot sector. */ +- bytes_written = EngFncs->write_volume(ev, fd, block, NTFS_BLOCK_SIZE, (pd->fs_size << (EVMS_VSECTOR_SIZE_SHIFT - 1))); ++ bytes_written = EngFncs->write_volume(ev, fd, block, NTFS_BLOCK_SIZE, (ev->vol_size << (EVMS_VSECTOR_SIZE_SHIFT - 1))); + if (bytes_written != NTFS_BLOCK_SIZE) { + LOG_WARNING("Failed to clear the primary boot sector on volume %s. " + "Only %d bytes were written.\n", |