git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
partitions
/
efi.c
diff --git
a/fs/partitions/efi.c
b/fs/partitions/efi.c
index
0f5b017
..
1bea610
100644
(file)
--- a/
fs/partitions/efi.c
+++ b/
fs/partitions/efi.c
@@
-91,7
+91,6
@@
* - Code works, detects all the partitions.
*
************************************************************/
* - Code works, detects all the partitions.
*
************************************************************/
-#include <linux/config.h>
#include <linux/crc32.h>
#include "check.h"
#include "efi.h"
#include <linux/crc32.h>
#include "check.h"
#include "efi.h"
@@
-239,10
+238,9
@@
alloc_read_gpt_entries(struct block_device *bdev, gpt_header *gpt)
le32_to_cpu(gpt->sizeof_partition_entry);
if (!count)
return NULL;
le32_to_cpu(gpt->sizeof_partition_entry);
if (!count)
return NULL;
- pte = k
m
alloc(count, GFP_KERNEL);
+ pte = k
z
alloc(count, GFP_KERNEL);
if (!pte)
return NULL;
if (!pte)
return NULL;
- memset(pte, 0, count);
if (read_lba(bdev, le64_to_cpu(gpt->partition_entry_lba),
(u8 *) pte,
if (read_lba(bdev, le64_to_cpu(gpt->partition_entry_lba),
(u8 *) pte,
@@
-270,10
+268,9
@@
alloc_read_gpt_header(struct block_device *bdev, u64 lba)
if (!bdev)
return NULL;
if (!bdev)
return NULL;
- gpt = k
m
alloc(sizeof (gpt_header), GFP_KERNEL);
+ gpt = k
z
alloc(sizeof (gpt_header), GFP_KERNEL);
if (!gpt)
return NULL;
if (!gpt)
return NULL;
- memset(gpt, 0, sizeof (gpt_header));
if (read_lba(bdev, lba, (u8 *) gpt,
sizeof (gpt_header)) < sizeof (gpt_header)) {
if (read_lba(bdev, lba, (u8 *) gpt,
sizeof (gpt_header)) < sizeof (gpt_header)) {
@@
-527,9
+524,8
@@
find_valid_gpt(struct block_device *bdev, gpt_header **gpt, gpt_entry **ptes)
lastlba = last_lba(bdev);
if (!force_gpt) {
/* This will be added to the EFI Spec. per Intel after v1.02. */
lastlba = last_lba(bdev);
if (!force_gpt) {
/* This will be added to the EFI Spec. per Intel after v1.02. */
- legacymbr = k
m
alloc(sizeof (*legacymbr), GFP_KERNEL);
+ legacymbr = k
z
alloc(sizeof (*legacymbr), GFP_KERNEL);
if (legacymbr) {
if (legacymbr) {
- memset(legacymbr, 0, sizeof (*legacymbr));
read_lba(bdev, 0, (u8 *) legacymbr,
sizeof (*legacymbr));
good_pmbr = is_pmbr_valid(legacymbr, lastlba);
read_lba(bdev, 0, (u8 *) legacymbr,
sizeof (*legacymbr));
good_pmbr = is_pmbr_valid(legacymbr, lastlba);