|
 |
2c1b57 |
From 091e8e6e061a5739be68d214bbd4a25e38bec65c Mon Sep 17 00:00:00 2001
|
|
|
2c1b57 |
From: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
|
2c1b57 |
Date: Wed, 5 Apr 2017 15:34:44 -0400
|
|
|
2c1b57 |
Subject: [RHEL7.5 PATCH 059/169] Manage: Remove all references to
|
|
|
2c1b57 |
md_get_version()
|
|
|
2c1b57 |
|
|
|
2c1b57 |
At this point, support for md driver prior to 0.90.03 is going to
|
|
|
2c1b57 |
disappear.
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
|
2c1b57 |
---
|
|
|
2c1b57 |
Manage.c | 20 +-------------------
|
|
|
2c1b57 |
1 file changed, 1 insertion(+), 19 deletions(-)
|
|
|
2c1b57 |
|
|
|
2c1b57 |
diff --git a/Manage.c b/Manage.c
|
|
|
2c1b57 |
index 618c98b..9e69132 100644
|
|
|
2c1b57 |
--- a/Manage.c
|
|
|
2c1b57 |
+++ b/Manage.c
|
|
|
2c1b57 |
@@ -46,10 +46,6 @@ int Manage_ro(char *devname, int fd, int readonly)
|
|
|
2c1b57 |
#endif
|
|
|
2c1b57 |
int rv = 0;
|
|
|
2c1b57 |
|
|
|
2c1b57 |
- if (md_get_version(fd) < 9000) {
|
|
|
2c1b57 |
- pr_err("need md driver version 0.90.0 or later\n");
|
|
|
2c1b57 |
- return 1;
|
|
|
2c1b57 |
- }
|
|
|
2c1b57 |
#ifndef MDASSEMBLE
|
|
|
2c1b57 |
/* If this is an externally-managed array, we need to modify the
|
|
|
2c1b57 |
* metadata_version so that mdmon doesn't undo our change.
|
|
|
2c1b57 |
@@ -176,10 +172,6 @@ int Manage_run(char *devname, int fd, struct context *c)
|
|
|
2c1b57 |
*/
|
|
|
2c1b57 |
char nm[32], *nmp;
|
|
|
2c1b57 |
|
|
|
2c1b57 |
- if (md_get_version(fd) < 9000) {
|
|
|
2c1b57 |
- pr_err("need md driver version 0.90.0 or later\n");
|
|
|
2c1b57 |
- return 1;
|
|
|
2c1b57 |
- }
|
|
|
2c1b57 |
nmp = fd2devnm(fd);
|
|
|
2c1b57 |
if (!nmp) {
|
|
|
2c1b57 |
pr_err("Cannot find %s in sysfs!!\n", devname);
|
|
|
2c1b57 |
@@ -207,14 +199,6 @@ int Manage_stop(char *devname, int fd, int verbose, int will_retry)
|
|
|
2c1b57 |
if (will_retry && verbose == 0)
|
|
|
2c1b57 |
verbose = -1;
|
|
|
2c1b57 |
|
|
|
2c1b57 |
- if (md_get_version(fd) < 9000) {
|
|
|
2c1b57 |
- if (ioctl(fd, STOP_MD, 0) == 0)
|
|
|
2c1b57 |
- return 0;
|
|
|
2c1b57 |
- pr_err("stopping device %s failed: %s\n",
|
|
|
2c1b57 |
- devname, strerror(errno));
|
|
|
2c1b57 |
- return 1;
|
|
|
2c1b57 |
- }
|
|
|
2c1b57 |
-
|
|
|
2c1b57 |
strcpy(devnm, fd2devnm(fd));
|
|
|
2c1b57 |
/* Get EXCL access first. If this fails, then attempting
|
|
|
2c1b57 |
* to stop is probably a bad idea.
|
|
|
2c1b57 |
@@ -773,9 +757,7 @@ int Manage_add(int fd, int tfd, struct mddev_dev *dv,
|
|
|
2c1b57 |
" Adding anyway as --force was given.\n",
|
|
|
2c1b57 |
dv->devname, devname);
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
- if (!tst->ss->external &&
|
|
|
2c1b57 |
- array->major_version == 0 &&
|
|
|
2c1b57 |
- md_get_version(fd)%100 < 2) {
|
|
|
2c1b57 |
+ if (!tst->ss->external && array->major_version == 0) {
|
|
|
2c1b57 |
if (ioctl(fd, HOT_ADD_DISK, rdev)==0) {
|
|
|
2c1b57 |
if (verbose >= 0)
|
|
|
2c1b57 |
pr_err("hot added %s\n",
|
|
|
2c1b57 |
--
|
|
|
2c1b57 |
2.7.4
|
|
|
2c1b57 |
|