Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 891ea147 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Change argument to gfs2_dinode_in 



This is a preliminary patch to enable the removal of fields
in gfs2_dinode_host which are duplicated in struct inode.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 539e5d6b

fs/gfs2/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -229,7 +229,7 @@ int gfs2_inode_refresh(struct gfs2_inode *ip) 
		return -EIO;

		return -EIO;

	}

	}





	gfs2_dinode_in(&ip->i_di, dibh->b_data);

	gfs2_dinode_in(ip, dibh->b_data);





	brelse(dibh);

	brelse(dibh);

fs/gfs2/ondisk.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -155,8 +155,9 @@ void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf) 
	qu->qu_value = be64_to_cpu(str->qu_value);

	qu->qu_value = be64_to_cpu(str->qu_value);

}

}





void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf)

void gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)

{

{

	struct gfs2_dinode_host *di = &ip->i_di;

	const struct gfs2_dinode *str = buf;

	const struct gfs2_dinode *str = buf;





	gfs2_meta_header_in(&di->di_header, buf);

	gfs2_meta_header_in(&di->di_header, buf);
@@ -186,7 +187,6 @@ void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf) 
	di->di_entries = be32_to_cpu(str->di_entries);

	di->di_entries = be32_to_cpu(str->di_entries);





	di->di_eattr = be64_to_cpu(str->di_eattr);

	di->di_eattr = be64_to_cpu(str->di_eattr);



}

}





void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)

void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)

include/linux/gfs2_ondisk.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -534,8 +534,8 @@ extern void gfs2_rindex_out(const struct gfs2_rindex_host *ri, void *buf); 
extern void gfs2_rgrp_in(struct gfs2_rgrp_host *rg, const void *buf);

extern void gfs2_rgrp_in(struct gfs2_rgrp_host *rg, const void *buf);

extern void gfs2_rgrp_out(const struct gfs2_rgrp_host *rg, void *buf);

extern void gfs2_rgrp_out(const struct gfs2_rgrp_host *rg, void *buf);

extern void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf);

extern void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf);

extern void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf);

struct gfs2_inode;

struct gfs2_inode;

extern void gfs2_dinode_in(struct gfs2_inode *ip, const void *buf);

extern void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf);

extern void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf);

extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf);

extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf);

extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf);

extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf);