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

Commit 4cc14f0b authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Change argument to gfs2_dinode_print 



Change argument for gfs2_dinode_print in order to prepare
for removal of duplicate fields between struct inode and
struct gfs2_dinode_host.

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

fs/gfs2/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ int gfs2_inode_refresh(struct gfs2_inode *ip) 


	if (ip->i_num.no_addr != ip->i_di.di_num.no_addr) {

		if (gfs2_consist_inode(ip))

			gfs2_dinode_print(&ip->i_di);

			gfs2_dinode_print(ip);

		return -EIO;

	}

	if (ip->i_num.no_formal_ino != ip->i_di.di_num.no_formal_ino)
@@ -289,7 +289,7 @@ int gfs2_dinode_dealloc(struct gfs2_inode *ip) 


	if (ip->i_di.di_blocks != 1) {

		if (gfs2_consist_inode(ip))

			gfs2_dinode_print(&ip->i_di);

			gfs2_dinode_print(ip);

		return -EIO;

	}
@@ -359,7 +359,7 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff) 
	   bigger than the old one, we must have underflowed. */

	if (diff < 0 && nlink > ip->i_di.di_nlink) {

		if (gfs2_consist_inode(ip))

			gfs2_dinode_print(&ip->i_di);

			gfs2_dinode_print(ip);

		return -EIO;

	}
@@ -1010,7 +1010,7 @@ int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name, 


	if (ip->i_di.di_entries != 2) {

		if (gfs2_consist_inode(ip))

			gfs2_dinode_print(&ip->i_di);

			gfs2_dinode_print(ip);

		return -EIO;

	}

fs/gfs2/ondisk.c

+3 −1
Original line number Diff line number Diff line
@@ -190,8 +190,10 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) 


}



void gfs2_dinode_print(const struct gfs2_dinode_host *di)

void gfs2_dinode_print(const struct gfs2_inode *ip)

{

	const struct gfs2_dinode_host *di = &ip->i_di;



	gfs2_meta_header_print(&di->di_header);

	gfs2_inum_print(&di->di_num);

fs/gfs2/ops_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ static int gfs2_rmdir(struct inode *dir, struct dentry *dentry) 


	if (ip->i_di.di_entries < 2) {

		if (gfs2_consist_inode(ip))

			gfs2_dinode_print(&ip->i_di);

			gfs2_dinode_print(ip);

		error = -EIO;

		goto out_gunlock;

	}
@@ -640,7 +640,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, 
		if (S_ISDIR(nip->i_di.di_mode)) {

			if (nip->i_di.di_entries < 2) {

				if (gfs2_consist_inode(nip))

					gfs2_dinode_print(&nip->i_di);

					gfs2_dinode_print(nip);

				error = -EIO;

				goto out_gunlock;

			}

include/linux/gfs2_ondisk.h

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ extern void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void * 
/* Printing functions */



extern void gfs2_rindex_print(const struct gfs2_rindex_host *ri);

extern void gfs2_dinode_print(const struct gfs2_dinode_host *di);

extern void gfs2_dinode_print(const struct gfs2_inode *ip);



#endif /* __KERNEL__ */