Commit 629a21e7 authored by Al Viro's avatar Al Viro Committed by Steven Whitehouse
Browse files

[GFS2] split and annotate gfs2_inum 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 1e81c4c3

fs/gfs2/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ static int do_filldir_main(struct gfs2_inode *dip, u64 *offset, 
			   int *copied)

{

	const struct gfs2_dirent *dent, *dent_next;

	struct gfs2_inum inum;

	struct gfs2_inum_host inum;

	u64 off, off_next;

	unsigned int x, y;

	int run = 0;
@@ -1456,7 +1456,7 @@ int gfs2_dir_read(struct inode *inode, u64 *offset, void *opaque, 
 */



int gfs2_dir_search(struct inode *dir, const struct qstr *name,

		    struct gfs2_inum *inum, unsigned int *type)

		    struct gfs2_inum_host *inum, unsigned int *type)

{

	struct buffer_head *bh;

	struct gfs2_dirent *dent;
@@ -1531,7 +1531,7 @@ static int dir_new_leaf(struct inode *inode, const struct qstr *name) 
 */



int gfs2_dir_add(struct inode *inode, const struct qstr *name,

		 const struct gfs2_inum *inum, unsigned type)

		 const struct gfs2_inum_host *inum, unsigned type)

{

	struct gfs2_inode *ip = GFS2_I(inode);

	struct buffer_head *bh;
@@ -1666,7 +1666,7 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct qstr *name) 
 */



int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename,

		   struct gfs2_inum *inum, unsigned int new_type)

		   struct gfs2_inum_host *inum, unsigned int new_type)

{

	struct buffer_head *bh;

	struct gfs2_dirent *dent;

fs/gfs2/dir.h

+4 −4
Original line number Diff line number Diff line
@@ -31,17 +31,17 @@ struct gfs2_inum; 
typedef int (*gfs2_filldir_t) (void *opaque,

			      const char *name, unsigned int length,

			      u64 offset,

			      struct gfs2_inum *inum, unsigned int type);

			      struct gfs2_inum_host *inum, unsigned int type);



int gfs2_dir_search(struct inode *dir, const struct qstr *filename,

		    struct gfs2_inum *inum, unsigned int *type);

		    struct gfs2_inum_host *inum, unsigned int *type);

int gfs2_dir_add(struct inode *inode, const struct qstr *filename,

		 const struct gfs2_inum *inum, unsigned int type);

		 const struct gfs2_inum_host *inum, unsigned int type);

int gfs2_dir_del(struct gfs2_inode *dip, const struct qstr *filename);

int gfs2_dir_read(struct inode *inode, u64 * offset, void *opaque,

		  gfs2_filldir_t filldir);

int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename,

		   struct gfs2_inum *new_inum, unsigned int new_type);

		   struct gfs2_inum_host *new_inum, unsigned int new_type);



int gfs2_dir_exhash_dealloc(struct gfs2_inode *dip);

fs/gfs2/incore.h

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ enum { 


struct gfs2_inode {

	struct inode i_inode;

	struct gfs2_inum i_num;

	struct gfs2_inum_host i_num;



	unsigned long i_flags;		/* GIF_... */

fs/gfs2/inode.c

+11 −11
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void gfs2_inode_attr_out(struct gfs2_inode *ip) 
static int iget_test(struct inode *inode, void *opaque)

{

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_inum *inum = opaque;

	struct gfs2_inum_host *inum = opaque;



	if (ip && ip->i_num.no_addr == inum->no_addr)

		return 1;
@@ -123,19 +123,19 @@ static int iget_test(struct inode *inode, void *opaque) 
static int iget_set(struct inode *inode, void *opaque)

{

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_inum *inum = opaque;

	struct gfs2_inum_host *inum = opaque;



	ip->i_num = *inum;

	return 0;

}



struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum *inum)

struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum_host *inum)

{

	return ilookup5(sb, (unsigned long)inum->no_formal_ino,

			iget_test, inum);

}



static struct inode *gfs2_iget(struct super_block *sb, struct gfs2_inum *inum)

static struct inode *gfs2_iget(struct super_block *sb, struct gfs2_inum_host *inum)

{

	return iget5_locked(sb, (unsigned long)inum->no_formal_ino,

		     iget_test, iget_set, inum);
@@ -150,7 +150,7 @@ static struct inode *gfs2_iget(struct super_block *sb, struct gfs2_inum *inum) 
 * Returns: A VFS inode, or an error

 */



struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum *inum, unsigned int type)

struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum_host *inum, unsigned int type)

{

	struct inode *inode = gfs2_iget(sb, inum);

	struct gfs2_inode *ip = GFS2_I(inode);
@@ -394,7 +394,7 @@ struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, 
	struct super_block *sb = dir->i_sb;

	struct gfs2_inode *dip = GFS2_I(dir);

	struct gfs2_holder d_gh;

	struct gfs2_inum inum;

	struct gfs2_inum_host inum;

	unsigned int type;

	int error = 0;

	struct inode *inode = NULL;
@@ -610,7 +610,7 @@ static void munge_mode_uid_gid(struct gfs2_inode *dip, unsigned int *mode, 
		*gid = current->fsgid;

}



static int alloc_dinode(struct gfs2_inode *dip, struct gfs2_inum *inum,

static int alloc_dinode(struct gfs2_inode *dip, struct gfs2_inum_host *inum,

			u64 *generation)

{

	struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode);
@@ -650,7 +650,7 @@ static int alloc_dinode(struct gfs2_inode *dip, struct gfs2_inum *inum, 
 */



static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl,

			const struct gfs2_inum *inum, unsigned int mode,

			const struct gfs2_inum_host *inum, unsigned int mode,

			unsigned int uid, unsigned int gid,

			const u64 *generation)

{
@@ -707,7 +707,7 @@ static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl, 
}



static int make_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl,

		       unsigned int mode, const struct gfs2_inum *inum,

		       unsigned int mode, const struct gfs2_inum_host *inum,

		       const u64 *generation)

{

	struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode);
@@ -866,7 +866,7 @@ struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name, 
	struct gfs2_inode *dip = ghs->gh_gl->gl_object;

	struct inode *dir = &dip->i_inode;

	struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode);

	struct gfs2_inum inum;

	struct gfs2_inum_host inum;

	int error;

	u64 generation;
@@ -1018,7 +1018,7 @@ int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name, 
int gfs2_unlink_ok(struct gfs2_inode *dip, const struct qstr *name,

		   struct gfs2_inode *ip)

{

	struct gfs2_inum inum;

	struct gfs2_inum_host inum;

	unsigned int type;

	int error;

fs/gfs2/inode.h

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ static inline int gfs2_is_dir(struct gfs2_inode *ip) 


void gfs2_inode_attr_in(struct gfs2_inode *ip);

void gfs2_inode_attr_out(struct gfs2_inode *ip);

struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum *inum, unsigned type);

struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum *inum);

struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum_host *inum, unsigned type);

struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum_host *inum);



int gfs2_inode_refresh(struct gfs2_inode *ip);