|
 |
2c1b57 |
From 44356754ec8d7c38720db6c9916fef8f24921831 Mon Sep 17 00:00:00 2001
|
|
|
2c1b57 |
From: Jes Sorensen <jsorensen@fb.com>
|
|
|
2c1b57 |
Date: Thu, 20 Apr 2017 11:53:30 -0400
|
|
|
2c1b57 |
Subject: [RHEL7.5 PATCH 085/169] util: Get rid of unused enough_fd()
|
|
|
2c1b57 |
|
|
|
2c1b57 |
enough_fd() is no longer used, so lets get rid of it.
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
2c1b57 |
---
|
|
|
2c1b57 |
mdadm.h | 1 -
|
|
|
2c1b57 |
util.c | 31 -------------------------------
|
|
|
2c1b57 |
2 files changed, 32 deletions(-)
|
|
|
2c1b57 |
|
|
|
2c1b57 |
diff --git a/mdadm.h b/mdadm.h
|
|
|
2c1b57 |
index f6e97fd..1bbacfe 100644
|
|
|
2c1b57 |
--- a/mdadm.h
|
|
|
2c1b57 |
+++ b/mdadm.h
|
|
|
2c1b57 |
@@ -1485,7 +1485,6 @@ extern char *fname_from_uuid(struct supertype *st,
|
|
|
2c1b57 |
extern unsigned long calc_csum(void *super, int bytes);
|
|
|
2c1b57 |
extern int enough(int level, int raid_disks, int layout, int clean,
|
|
|
2c1b57 |
char *avail);
|
|
|
2c1b57 |
-extern int enough_fd(int fd);
|
|
|
2c1b57 |
extern int ask(char *mesg);
|
|
|
2c1b57 |
extern unsigned long long get_component_size(int fd);
|
|
|
2c1b57 |
extern void remove_partitions(int fd);
|
|
|
2c1b57 |
diff --git a/util.c b/util.c
|
|
|
2c1b57 |
index 3adc675..21a63c9 100644
|
|
|
2c1b57 |
--- a/util.c
|
|
|
2c1b57 |
+++ b/util.c
|
|
|
2c1b57 |
@@ -542,37 +542,6 @@ int enough(int level, int raid_disks, int layout, int clean, char *avail)
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
|
|
|
2c1b57 |
-int enough_fd(int fd)
|
|
|
2c1b57 |
-{
|
|
|
2c1b57 |
- struct mdu_array_info_s array;
|
|
|
2c1b57 |
- struct mdu_disk_info_s disk;
|
|
|
2c1b57 |
- int i, rv;
|
|
|
2c1b57 |
- char *avail;
|
|
|
2c1b57 |
-
|
|
|
2c1b57 |
- if (md_get_array_info(fd, &array) != 0 || array.raid_disks <= 0)
|
|
|
2c1b57 |
- return 0;
|
|
|
2c1b57 |
- avail = xcalloc(array.raid_disks, 1);
|
|
|
2c1b57 |
- for (i = 0; i < MAX_DISKS && array.nr_disks > 0; i++) {
|
|
|
2c1b57 |
- disk.number = i;
|
|
|
2c1b57 |
- if (md_get_disk_info(fd, &disk) != 0)
|
|
|
2c1b57 |
- continue;
|
|
|
2c1b57 |
- if (disk.major == 0 && disk.minor == 0)
|
|
|
2c1b57 |
- continue;
|
|
|
2c1b57 |
- array.nr_disks--;
|
|
|
2c1b57 |
-
|
|
|
2c1b57 |
- if (! (disk.state & (1<
|
|
|
2c1b57 |
- continue;
|
|
|
2c1b57 |
- if (disk.raid_disk < 0 || disk.raid_disk >= array.raid_disks)
|
|
|
2c1b57 |
- continue;
|
|
|
2c1b57 |
- avail[disk.raid_disk] = 1;
|
|
|
2c1b57 |
- }
|
|
|
2c1b57 |
- /* This is used on an active array, so assume it is clean */
|
|
|
2c1b57 |
- rv = enough(array.level, array.raid_disks, array.layout,
|
|
|
2c1b57 |
- 1, avail);
|
|
|
2c1b57 |
- free(avail);
|
|
|
2c1b57 |
- return rv;
|
|
|
2c1b57 |
-}
|
|
|
2c1b57 |
-
|
|
|
2c1b57 |
const int uuid_zero[4] = { 0, 0, 0, 0 };
|
|
|
2c1b57 |
|
|
|
2c1b57 |
int same_uuid(int a[4], int b[4], int swapuuid)
|
|
|
2c1b57 |
--
|
|
|
2c1b57 |
2.7.4
|
|
|
2c1b57 |
|