From 52d1a33a47b80fd62f9de8b8cc503670baafae48 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Fri, 16 May 2008 13:30:15 -0400 Subject: [PATCH] --- yaml --- r: 128781 b: refs/heads/master c: 515dc3228c568f9df8b634f82b3471e20205ac16 h: refs/heads/master i: 128779: 304432f4f273f11defc22a57b2fdff91acfe6e4f v: v3 --- [refs] | 2 +- trunk/fs/btrfs/volumes.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 192d988dfe8e..124ea1faa6d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6af5ac3c1aede574acde5fc477f1a1c876fb568e +refs/heads/master: 515dc3228c568f9df8b634f82b3471e20205ac16 diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c index 3fbf0834e884..333e5269577a 100644 --- a/trunk/fs/btrfs/volumes.c +++ b/trunk/fs/btrfs/volumes.c @@ -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,