aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/volumes.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 3fbf0834e884..333e5269577a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -120,7 +120,7 @@ static int device_list_add(const char *path,
120 120
121 fs_devices = find_fsid(disk_super->fsid); 121 fs_devices = find_fsid(disk_super->fsid);
122 if (!fs_devices) { 122 if (!fs_devices) {
123 fs_devices = kmalloc(sizeof(*fs_devices), GFP_NOFS); 123 fs_devices = kzalloc(sizeof(*fs_devices), GFP_NOFS);
124 if (!fs_devices) 124 if (!fs_devices)
125 return -ENOMEM; 125 return -ENOMEM;
126 INIT_LIST_HEAD(&fs_devices->devices); 126 INIT_LIST_HEAD(&fs_devices->devices);
@@ -129,7 +129,6 @@ static int device_list_add(const char *path,
129 memcpy(fs_devices->fsid, disk_super->fsid, BTRFS_FSID_SIZE); 129 memcpy(fs_devices->fsid, disk_super->fsid, BTRFS_FSID_SIZE);
130 fs_devices->latest_devid = devid; 130 fs_devices->latest_devid = devid;
131 fs_devices->latest_trans = found_transid; 131 fs_devices->latest_trans = found_transid;
132 fs_devices->num_devices = 0;
133 device = NULL; 132 device = NULL;
134 } else { 133 } else {
135 device = __find_device(&fs_devices->devices, devid, 134 device = __find_device(&fs_devices->devices, devid,