|
 |
fdf7c0 |
From 679bd9508a30b2a0a1baecc9a21dd6c7d8d8d7dc Mon Sep 17 00:00:00 2001
|
|
|
fdf7c0 |
From: Logan Gunthorpe <logang@deltatee.com>
|
|
|
fdf7c0 |
Date: Wed, 22 Jun 2022 14:25:07 -0600
|
|
|
fdf7c0 |
Subject: [PATCH 32/52] DDF: Cleanup validate_geometry_ddf_container()
|
|
|
fdf7c0 |
|
|
|
fdf7c0 |
Move the function up so that the function declaration is not necessary
|
|
|
fdf7c0 |
and remove the unused arguments to the function.
|
|
|
fdf7c0 |
|
|
|
fdf7c0 |
No functional changes are intended but will help with a bug fix in the
|
|
|
fdf7c0 |
next patch.
|
|
|
fdf7c0 |
|
|
|
fdf7c0 |
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
|
|
|
fdf7c0 |
Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
|
|
fdf7c0 |
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
|
|
|
fdf7c0 |
---
|
|
|
fdf7c0 |
super-ddf.c | 88 ++++++++++++++++++++++++-----------------------------
|
|
|
fdf7c0 |
1 file changed, 39 insertions(+), 49 deletions(-)
|
|
|
fdf7c0 |
|
|
|
fdf7c0 |
diff --git a/super-ddf.c b/super-ddf.c
|
|
|
fdf7c0 |
index abbc8b09..9d867f69 100644
|
|
|
fdf7c0 |
--- a/super-ddf.c
|
|
|
fdf7c0 |
+++ b/super-ddf.c
|
|
|
fdf7c0 |
@@ -503,13 +503,6 @@ struct ddf_super {
|
|
|
fdf7c0 |
static int load_super_ddf_all(struct supertype *st, int fd,
|
|
|
fdf7c0 |
void **sbp, char *devname);
|
|
|
fdf7c0 |
static int get_svd_state(const struct ddf_super *, const struct vcl *);
|
|
|
fdf7c0 |
-static int
|
|
|
fdf7c0 |
-validate_geometry_ddf_container(struct supertype *st,
|
|
|
fdf7c0 |
- int level, int layout, int raiddisks,
|
|
|
fdf7c0 |
- int chunk, unsigned long long size,
|
|
|
fdf7c0 |
- unsigned long long data_offset,
|
|
|
fdf7c0 |
- char *dev, unsigned long long *freesize,
|
|
|
fdf7c0 |
- int verbose);
|
|
|
fdf7c0 |
|
|
|
fdf7c0 |
static int validate_geometry_ddf_bvd(struct supertype *st,
|
|
|
fdf7c0 |
int level, int layout, int raiddisks,
|
|
|
fdf7c0 |
@@ -3322,6 +3315,42 @@ static int reserve_space(struct supertype *st, int raiddisks,
|
|
|
fdf7c0 |
return 1;
|
|
|
fdf7c0 |
}
|
|
|
fdf7c0 |
|
|
|
fdf7c0 |
+static int
|
|
|
fdf7c0 |
+validate_geometry_ddf_container(struct supertype *st,
|
|
|
fdf7c0 |
+ int level, int raiddisks,
|
|
|
fdf7c0 |
+ unsigned long long data_offset,
|
|
|
fdf7c0 |
+ char *dev, unsigned long long *freesize,
|
|
|
fdf7c0 |
+ int verbose)
|
|
|
fdf7c0 |
+{
|
|
|
fdf7c0 |
+ int fd;
|
|
|
fdf7c0 |
+ unsigned long long ldsize;
|
|
|
fdf7c0 |
+
|
|
|
fdf7c0 |
+ if (level != LEVEL_CONTAINER)
|
|
|
fdf7c0 |
+ return 0;
|
|
|
fdf7c0 |
+ if (!dev)
|
|
|
fdf7c0 |
+ return 1;
|
|
|
fdf7c0 |
+
|
|
|
fdf7c0 |
+ fd = dev_open(dev, O_RDONLY|O_EXCL);
|
|
|
fdf7c0 |
+ if (fd < 0) {
|
|
|
fdf7c0 |
+ if (verbose)
|
|
|
fdf7c0 |
+ pr_err("ddf: Cannot open %s: %s\n",
|
|
|
fdf7c0 |
+ dev, strerror(errno));
|
|
|
fdf7c0 |
+ return 0;
|
|
|
fdf7c0 |
+ }
|
|
|
fdf7c0 |
+ if (!get_dev_size(fd, dev, &ldsize)) {
|
|
|
fdf7c0 |
+ close(fd);
|
|
|
fdf7c0 |
+ return 0;
|
|
|
fdf7c0 |
+ }
|
|
|
fdf7c0 |
+ close(fd);
|
|
|
fdf7c0 |
+ if (freesize) {
|
|
|
fdf7c0 |
+ *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS);
|
|
|
fdf7c0 |
+ if (*freesize == 0)
|
|
|
fdf7c0 |
+ return 0;
|
|
|
fdf7c0 |
+ }
|
|
|
fdf7c0 |
+
|
|
|
fdf7c0 |
+ return 1;
|
|
|
fdf7c0 |
+}
|
|
|
fdf7c0 |
+
|
|
|
fdf7c0 |
static int validate_geometry_ddf(struct supertype *st,
|
|
|
fdf7c0 |
int level, int layout, int raiddisks,
|
|
|
fdf7c0 |
int *chunk, unsigned long long size,
|
|
|
fdf7c0 |
@@ -3347,11 +3376,9 @@ static int validate_geometry_ddf(struct supertype *st,
|
|
|
fdf7c0 |
level = LEVEL_CONTAINER;
|
|
|
fdf7c0 |
if (level == LEVEL_CONTAINER) {
|
|
|
fdf7c0 |
/* Must be a fresh device to add to a container */
|
|
|
fdf7c0 |
- return validate_geometry_ddf_container(st, level, layout,
|
|
|
fdf7c0 |
- raiddisks, *chunk,
|
|
|
fdf7c0 |
- size, data_offset, dev,
|
|
|
fdf7c0 |
- freesize,
|
|
|
fdf7c0 |
- verbose);
|
|
|
fdf7c0 |
+ return validate_geometry_ddf_container(st, level, raiddisks,
|
|
|
fdf7c0 |
+ data_offset, dev,
|
|
|
fdf7c0 |
+ freesize, verbose);
|
|
|
fdf7c0 |
}
|
|
|
fdf7c0 |
|
|
|
fdf7c0 |
if (!dev) {
|
|
|
fdf7c0 |
@@ -3449,43 +3476,6 @@ static int validate_geometry_ddf(struct supertype *st,
|
|
|
fdf7c0 |
return 1;
|
|
|
fdf7c0 |
}
|
|
|
fdf7c0 |
|
|
|
fdf7c0 |
-static int
|
|
|
fdf7c0 |
-validate_geometry_ddf_container(struct supertype *st,
|
|
|
fdf7c0 |
- int level, int layout, int raiddisks,
|
|
|
fdf7c0 |
- int chunk, unsigned long long size,
|
|
|
fdf7c0 |
- unsigned long long data_offset,
|
|
|
fdf7c0 |
- char *dev, unsigned long long *freesize,
|
|
|
fdf7c0 |
- int verbose)
|
|
|
fdf7c0 |
-{
|
|
|
fdf7c0 |
- int fd;
|
|
|
fdf7c0 |
- unsigned long long ldsize;
|
|
|
fdf7c0 |
-
|
|
|
fdf7c0 |
- if (level != LEVEL_CONTAINER)
|
|
|
fdf7c0 |
- return 0;
|
|
|
fdf7c0 |
- if (!dev)
|
|
|
fdf7c0 |
- return 1;
|
|
|
fdf7c0 |
-
|
|
|
fdf7c0 |
- fd = dev_open(dev, O_RDONLY|O_EXCL);
|
|
|
fdf7c0 |
- if (fd < 0) {
|
|
|
fdf7c0 |
- if (verbose)
|
|
|
fdf7c0 |
- pr_err("ddf: Cannot open %s: %s\n",
|
|
|
fdf7c0 |
- dev, strerror(errno));
|
|
|
fdf7c0 |
- return 0;
|
|
|
fdf7c0 |
- }
|
|
|
fdf7c0 |
- if (!get_dev_size(fd, dev, &ldsize)) {
|
|
|
fdf7c0 |
- close(fd);
|
|
|
fdf7c0 |
- return 0;
|
|
|
fdf7c0 |
- }
|
|
|
fdf7c0 |
- close(fd);
|
|
|
fdf7c0 |
- if (freesize) {
|
|
|
fdf7c0 |
- *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS);
|
|
|
fdf7c0 |
- if (*freesize == 0)
|
|
|
fdf7c0 |
- return 0;
|
|
|
fdf7c0 |
- }
|
|
|
fdf7c0 |
-
|
|
|
fdf7c0 |
- return 1;
|
|
|
fdf7c0 |
-}
|
|
|
fdf7c0 |
-
|
|
|
fdf7c0 |
static int validate_geometry_ddf_bvd(struct supertype *st,
|
|
|
fdf7c0 |
int level, int layout, int raiddisks,
|
|
|
fdf7c0 |
int *chunk, unsigned long long size,
|
|
|
fdf7c0 |
--
|
|
|
fdf7c0 |
2.31.1
|
|
|
fdf7c0 |
|