]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Btrfs: Use kzalloc on the fs_devices allocation
authorChris Mason <chris.mason@oracle.com>
Fri, 16 May 2008 17:30:15 +0000 (13:30 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 25 Sep 2008 15:04:03 +0000 (11:04 -0400)
Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/volumes.c

index 3fbf0834e88474d168e59fce51bb3076b55674ab..333e5269577ae4af9512f507efa3b0ffcc231a65 100644 (file)
@@ -120,7 +120,7 @@ static int device_list_add(const char *path,
 
        fs_devices = find_fsid(disk_super->fsid);
        if (!fs_devices) {
-               fs_devices = kmalloc(sizeof(*fs_devices), GFP_NOFS);
+               fs_devices = kzalloc(sizeof(*fs_devices), GFP_NOFS);
                if (!fs_devices)
                        return -ENOMEM;
                INIT_LIST_HEAD(&fs_devices->devices);
@@ -129,7 +129,6 @@ static int device_list_add(const char *path,
                memcpy(fs_devices->fsid, disk_super->fsid, BTRFS_FSID_SIZE);
                fs_devices->latest_devid = devid;
                fs_devices->latest_trans = found_transid;
-               fs_devices->num_devices = 0;
                device = NULL;
        } else {
                device = __find_device(&fs_devices->devices, devid,