2021-04-01 08:06:20

by Jiabing Wan

Subject: [PATCH] fs: btrfs: Remove repeated struct declaration

struct btrfs_inode is declared twice. One is declared at 67th line.
The blew declaration is not needed. Remove the duplicate.
struct btrfs_fs_info should be declared in the forward declarations.
Move it to the forward declarations.

Signed-off-by: Wan Jiabing <[email protected]>
---
fs/btrfs/extent_io.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 824640cb0ace..227215a5722c 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -66,6 +66,7 @@ enum {
struct btrfs_root;
struct btrfs_inode;
struct btrfs_io_bio;
+struct btrfs_fs_info;
struct io_failure_record;
struct extent_io_tree;

@@ -270,9 +271,6 @@ struct bio *btrfs_io_bio_alloc(unsigned int nr_iovecs);
struct bio *btrfs_bio_clone(struct bio *bio);
struct bio *btrfs_bio_clone_partial(struct bio *orig, int offset, int size);

-struct btrfs_fs_info;
-struct btrfs_inode;
-
int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,
u64 length, u64 logical, struct page *page,
unsigned int pg_offset, int mirror_num);
--
2.25.1

2021-04-01 09:19:18

by Nikolay Borisov

Subject: Re: [PATCH] fs: btrfs: Remove repeated struct declaration

On 1.04.21 г. 11:03, Wan Jiabing wrote:
> struct btrfs_inode is declared twice. One is declared at 67th line.
> The blew declaration is not needed. Remove the duplicate.
> struct btrfs_fs_info should be declared in the forward declarations.
> Move it to the forward declarations.
>
> Signed-off-by: Wan Jiabing <[email protected]>

Reviewed-by: Nikolay Borisov <[email protected]>

2021-04-07 12:11:12

by David Sterba

Subject: Re: [PATCH] fs: btrfs: Remove repeated struct declaration

On Thu, Apr 01, 2021 at 04:03:39PM +0800, Wan Jiabing wrote:
> struct btrfs_inode is declared twice. One is declared at 67th line.
> The blew declaration is not needed. Remove the duplicate.
> struct btrfs_fs_info should be declared in the forward declarations.
> Move it to the forward declarations.

I've reworded the changelog a bit, patch added to misc-next, thanks.