ZFS: fix some warnings, cleanup

PATCH New Pavel Herrmann 3 participants 5 messages Sep 19, 2012 – Oct 16, 2012

lore

Share & tools

lore

Pavel Herrmann

author

2012-09-19 15:32 UTC #0 lore raw

PATCH 1/1 ZFS: fix some warnings, cleanup

Fix warnings about type mismatch in cmd_zfs.
Dont use a global block_dev_desc, instead use a local one in each cmd.

Signed-off-by Pavel Herrmann <[email protected]>

---
 common/cmd_zfs.c     | 7 +++++--
 fs/zfs/zfs.c         | 2 --
 include/zfs_common.h | 3 ---
 3 files changed, 5 insertions(+), 7 deletions(-)

common/cmd_zfs.c +5 -2

index a6ea2c0..42e286e 100644
@@ -46,7 +46,8 @@
 #define DOS_FS_TYPE_OFFSET	0x36
 #define DOS_FS32_TYPE_OFFSET	0x52
 
-static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc,
+	char * const argv[])
 {
 	char *filename = NULL;
 	char *ep;

@@ -60,6 +61,7 @@ static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	const char *addr_str;
 	struct zfs_file zfile;
 	struct device_s vdev;
+	struct block_dev_desc *zfs_dev_desc;
 
 	if (argc < 3)
 		return CMD_RET_USAGE;

@@ -178,7 +180,7 @@ int zfs_print(const char *entry, const struct zfs_dirhook_info *data)
 
 
 
-static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	const char *filename = "/";
 	int dev;

@@ -186,6 +188,7 @@ static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	char *ep;
 	int part_length;
 	struct device_s vdev;
+	struct block_dev_desc *zfs_dev_desc;
 
 	if (argc < 3)
 		return cmd_usage(cmdtp);

fs/zfs/zfs.c +0 -2

index 360f723..d709e02 100644
@@ -31,8 +31,6 @@
 #include <asm/byteorder.h>
 #include "zfs_common.h"
 
-block_dev_desc_t *zfs_dev_desc;
-
 /*
  * The zfs plug-in routines for GRUB are:
  *

include/zfs_common.h +0 -3

index 04e73d0..fa0919a 100644
@@ -66,9 +66,6 @@ struct zfs_filesystem {
 	block_dev_desc_t *dev_desc;
 };
 
-
-extern block_dev_desc_t *zfs_dev_desc;
-
 struct device_s {
 	uint64_t part_length;
 };

Signature · 1 line

1.7.12

Pavel Herrmann

author

2012-09-23 15:31 UTC #1 lore raw

PATCH 1/1 ZFS: fix some warnings, cleanup

Add some CCs

Quoted 77 lines · On Wednesday 19 September 2012 17:32:36 Pavel Herrmann wrote:

Fix warnings about type mismatch in cmd_zfs.
Dont use a global block_dev_desc, instead use a local one in each cmd.

Signed-off-by Pavel Herrmann <[email protected]>

---
 common/cmd_zfs.c     | 7 +++++--
 fs/zfs/zfs.c         | 2 --
 include/zfs_common.h | 3 ---
 3 files changed, 5 insertions(+), 7 deletions(-)

common/cmd_zfs.c +4 -2

index a6ea2c0..42e286e 100644
@@ -46,7 +46,8 @@
 #define DOS_FS_TYPE_OFFSET	0x36
 #define DOS_FS32_TYPE_OFFSET	0x52
 
-static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc,
+	char * const argv[])
 {
 	char *filename = NULL;
 	char *ep;

@@ -60,6 +61,7 @@ static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int
 argc, char *argv[]) const char *addr_str;
 	struct zfs_file zfile;
 	struct device_s vdev;
+	struct block_dev_desc *zfs_dev_desc;
 
 	if (argc < 3)
 		return CMD_RET_USAGE;

@@ -178,7 +180,7 @@ int zfs_print(const char *entry, const struct
 zfs_dirhook_info *data)
 
 
 
-static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const
 argv[]) {
 	const char *filename = "/";

common/cmd_zfs.c +1 -0

 	int dev;

@@ -186,6 +188,7 @@ static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int
 argc, char *argv[]) char *ep;
 	int part_length;
 	struct device_s vdev;
+	struct block_dev_desc *zfs_dev_desc;
 
 	if (argc < 3)
 		return cmd_usage(cmdtp);

fs/zfs/zfs.c +0 -2

index 360f723..d709e02 100644
@@ -31,8 +31,6 @@
 #include <asm/byteorder.h>
 #include "zfs_common.h"
 
-block_dev_desc_t *zfs_dev_desc;
-
 /*
  * The zfs plug-in routines for GRUB are:
  *

include/zfs_common.h +0 -3

index 04e73d0..fa0919a 100644
@@ -66,9 +66,6 @@ struct zfs_filesystem {
 	block_dev_desc_t *dev_desc;
 };
 
-
-extern block_dev_desc_t *zfs_dev_desc;
-
 struct device_s {
 	uint64_t part_length;
 };

Marek Vasut

2012-09-23 15:38 UTC #2 lore raw

PATCH 1/1 ZFS: fix some warnings, cleanup

Dear Pavel Herrmann,

Did you test the changes?

Quoted 5 lines

Add some CCs
Quoted 2 lines · On Wednesday 19 September 2012 17:32:36 Pavel Herrmann wrote:
Fix warnings about type mismatch in cmd_zfs.
Dont use a global block_dev_desc, instead use a local one in each cmd.

The warnings generated would be appreciated in the commit message.

Quoted 93 lines

Signed-off-by Pavel Herrmann <[email protected]>

---

 common/cmd_zfs.c     | 7 +++++--
 fs/zfs/zfs.c         | 2 --
 include/zfs_common.h | 3 ---
 3 files changed, 5 insertions(+), 7 deletions(-)

common/cmd_zfs.c +2 -1

index a6ea2c0..42e286e 100644
@@ -46,7 +46,8 @@
 
 #define DOS_FS_TYPE_OFFSET	0x36
 #define DOS_FS32_TYPE_OFFSET	0x52
 
-static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char
 *argv[]) +static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc,
+	char * const argv[])
 
 {
 
 	char *filename = NULL;
 	char *ep;

@@ -60,6 +61,7 @@ static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int
 argc, char *argv[]) const char *addr_str;
 
 	struct zfs_file zfile;
 	struct device_s vdev;
 
+	struct block_dev_desc *zfs_dev_desc;

common/cmd_zfs.c +1 -1

 	if (argc < 3)
 
 		return CMD_RET_USAGE;

@@ -178,7 +180,7 @@ int zfs_print(const char *entry, const struct
 zfs_dirhook_info *data)
 
 
 
-static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const
 argv[]) {

common/cmd_zfs.c +1 -0

 	const char *filename = "/";
 	int dev;

@@ -186,6 +188,7 @@ static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int
 argc, char *argv[]) char *ep;
 
 	int part_length;
 	struct device_s vdev;
 
+	struct block_dev_desc *zfs_dev_desc;

common/cmd_zfs.c +0 -0

 	if (argc < 3)
 
 		return cmd_usage(cmdtp);

fs/zfs/zfs.c +0 -2

index 360f723..d709e02 100644
@@ -31,8 +31,6 @@
 
 #include <asm/byteorder.h>
 #include "zfs_common.h"
 
-block_dev_desc_t *zfs_dev_desc;
-
 
 /*

* The zfs plug-in routines for GRUB are:
*

include/zfs_common.h +0 -3

index 04e73d0..fa0919a 100644
@@ -66,9 +66,6 @@ struct zfs_filesystem {
 
 	block_dev_desc_t *dev_desc;
 
 };
 
-
-extern block_dev_desc_t *zfs_dev_desc;
-

Quoted 5 lines

Quoted 5 lines
struct device_s {
uint64_t part_length;
};

Best regards,
Marek Vasut

Tom Rini

2012-10-16 00:33 UTC #3 lore raw

PATCH 1/1 ZFS: fix some warnings, cleanup

In reply to Pavel Herrmann

Quoted 4 lines · Pavel Herrmann

Fix warnings about type mismatch in cmd_zfs.
Dont use a global block_dev_desc, instead use a local one in each cmd.
Signed-off-by Pavel Herrmann <[email protected]>

[snip]

common/cmd_zfs.c line 50

Quoted 3 lines

common/cmd_zfs.c +2 -1

-static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc,
+	char * const argv[])

That's a checkpatch warning, please fix.

common/cmd_zfs.c int zfs_print(const char *entry, const struct zfs_dirhook_info *data) · line 183

Quoted 2 lines

common/cmd_zfs.c +1 -1

-static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

Same.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20121015/21671765/attachment.pgp>

Pavel Herrmann

author

2012-10-16 13:38 UTC #4 lore raw

PATCH 1/1 ZFS: fix some warnings, cleanup

Quoted 15 lines · On Monday 15 of October 2012 17:33:47 Tom Rini wrote:

Quoted 4 lines · Pavel Herrmann
Fix warnings about type mismatch in cmd_zfs.
Dont use a global block_dev_desc, instead use a local one in each cmd.
Signed-off-by Pavel Herrmann <[email protected]>
[snip]
common/cmd_zfs.c line 50
Quoted 4 lines
-static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
common/cmd_zfs.c +2 -0
+static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc,
+	char * const argv[])
That's a checkpatch warning, please fix.

Quoted 4 lines

Quoted 3 lines

(quoted diff) +1 -1

-static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const

argv[])

Same.

This patch is no longer relevant, as the important bits have been merged in next by Rob Herring as a part of the get_device_and_partition patch

Pavel Herrmann