[btrfs-progs/f18] Fix init-dev-list patch; remove old patches
Eric Sandeen
sandeen at fedoraproject.org
Tue Nov 26 15:42:46 UTC 2013
commit d17ecce819f7fbe1d0139baca9fc8eae0cd9c71c
Author: Eric Sandeen <sandeen at redhat.com>
Date: Tue Nov 26 08:04:44 2013 -0600
Fix init-dev-list patch; remove old patches
Btrfs-progs-add-btrfs-device-ready-command.patch | 84 ----------
...-detect-if-the-disk-we-are-formatting-is-.patch | 167 --------------------
...-make-btrfs-filesystem-show-uuid-actually.patch | 37 -----
btrfs-init-dev-list.patch | 9 -
btrfs-progs-build-everything.patch | 13 --
btrfs-progs-build-fixes.patch | 34 ----
...progs-correct-uninitialized-fsid-variable.patch | 55 -------
btrfs-progs-fix-labels.patch | 24 ---
8 files changed, 0 insertions(+), 423 deletions(-)
---
diff --git a/btrfs-init-dev-list.patch b/btrfs-init-dev-list.patch
index 80c0959..2dd40fc 100644
--- a/btrfs-init-dev-list.patch
+++ b/btrfs-init-dev-list.patch
@@ -2,15 +2,6 @@ diff --git a/utils.c b/utils.c
index a5ffb62..f6686c6 100644
--- a/utils.c
+++ b/utils.c
-@@ -476,7 +476,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
- u64 num_devs;
- int ret;
-
-- device = kmalloc(sizeof(*device), GFP_NOFS);
-+ device = kzalloc(sizeof(*device), GFP_NOFS);
- if (!device)
- return -ENOMEM;
- buf = kmalloc(sectorsize, GFP_NOFS);
@@ -502,6 +502,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
device->bytes_used = 0;
device->total_ios = 0;
More information about the scm-commits
mailing list