Attachment 157580 Details for Bug 243136 – combined draft patch for i_mode and no_formal_ino issue

[patch] combined draft patch for i_mode and no_formal_ino issue

gfs2_nfs.patch (text/plain), 10.03 KB, created by Wendy Cheng on 2007-06-21 22:11:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wendy Cheng

Created: 2007-06-21 22:11:46 UTC

Size: 10.03 KB

patch

obsolete

>--- gfs2-nmw/fs/gfs2/inode.h	2007-06-12 16:32:46.000000000 -0400
>+++ linux/fs/gfs2/inode.h	2007-06-21 17:42:57.000000000 -0400
>@@ -47,7 +47,9 @@ static inline void gfs2_inum_out(const s
> 
> 
> void gfs2_inode_attr_in(struct gfs2_inode *ip);
>-struct inode *gfs2_inode_lookup(struct super_block *sb, u64 no_addr, unsigned type);
>+struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum_host *ino, unsigned type, int nfs_bypass);
>+void gfs2_inode_nfsbypass(struct inode *inode);
>+
> struct inode *gfs2_ilookup(struct super_block *sb, u64 no_addr);
> 
> int gfs2_inode_refresh(struct gfs2_inode *ip);
>--- gfs2-nmw/fs/gfs2/inode.c	2007-06-12 16:32:45.000000000 -0400
>+++ linux/fs/gfs2/inode.c	2007-06-21 18:07:50.000000000 -0400
>@@ -86,12 +86,16 @@ static struct inode *gfs2_iget(struct su
>  * Returns: A VFS inode, or an error
>  */
> 
>-struct inode *gfs2_inode_lookup(struct super_block *sb, u64 no_addr, unsigned int type)
>+struct inode *gfs2_inode_lookup(struct super_block *sb, 
>+			struct gfs2_inum_host *ino,
>+			unsigned int type, 
>+			int where)
> {
>-	struct inode *inode = gfs2_iget(sb, no_addr);
>+	struct inode *inode = gfs2_iget(sb, ino->no_addr);
> 	struct gfs2_inode *ip = GFS2_I(inode);
> 	struct gfs2_glock *io_gl;
> 	int error;
>+	u64 no_addr = ino->no_addr;
> 
> 	if (!inode)
> 		return ERR_PTR(-ENOBUFS);
>@@ -100,6 +104,7 @@ struct inode *gfs2_inode_lookup(struct s
> 		struct gfs2_sbd *sdp = GFS2_SB(inode);
> 		umode_t mode;
> 		inode->i_private = ip;
>+		ip->i_no_formal_ino = ino->no_formal_ino;
> 
> 		error = gfs2_glock_get(sdp, no_addr, &gfs2_inode_glops, CREATE, &ip->i_gl);
> 		if (unlikely(error))
>@@ -126,11 +131,21 @@ struct inode *gfs2_inode_lookup(struct s
> 		 * which is not true in the general case).
> 		 */
> 		inode->i_mode = mode = DT2IF(type);
>+
>+		/* nfs by pass */
>+		if (type == DT_UNKNOWN) {
>+			if (where) {
>+				return inode;
>+			}
>+		}
>+
> 		if (type == DT_UNKNOWN) {
> 			struct gfs2_holder gh;
> 			error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
>-			if (unlikely(error))
>+			if (unlikely(error)) {
>+				printk("dt_unknown part fail error=%d\n", error);
> 				goto fail_glock;
>+			}
> 			/* Inode is now uptodate */
> 			mode = inode->i_mode;
> 			gfs2_glock_dq_uninit(&gh);
>@@ -248,6 +263,29 @@ int gfs2_inode_refresh(struct gfs2_inode
> 	return error;
> }
> 
>+void
>+gfs2_inode_nfsbypass(struct inode *inode)
>+{
>+	umode_t mode = inode->i_mode;
>+
>+        /* add pick up the works we bypass in gfs2_inode_lookup */
>+        if (S_ISREG(mode)) {
>+                inode->i_op = &gfs2_file_iops;
>+                inode->i_fop = &gfs2_file_fops;
>+                inode->i_mapping->a_ops = &gfs2_file_aops;
>+        } else if (S_ISDIR(mode)) {
>+                inode->i_op = &gfs2_dir_iops;
>+                inode->i_fop = &gfs2_dir_fops;
>+        } else if (S_ISLNK(mode)) {
>+                inode->i_op = &gfs2_symlink_iops;
>+        } else {
>+                inode->i_op = &gfs2_dev_iops;
>+        }
>+
>+        unlock_new_inode(inode);
>+        /* end of bypass... why do we need unlock_new_inode ? */
>+}
>+
> int gfs2_dinode_dealloc(struct gfs2_inode *ip)
> {
> 	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
>@@ -915,7 +953,7 @@ struct inode *gfs2_createi(struct gfs2_h
> 	if (error)
> 		goto fail_gunlock2;
> 
>-	inode = gfs2_inode_lookup(dir->i_sb, inum.no_addr, IF2DT(mode));
>+	inode = gfs2_inode_lookup(dir->i_sb, &inum, IF2DT(mode), 0);
> 	if (IS_ERR(inode))
> 		goto fail_gunlock2;
> 
>--- gfs2-nmw/fs/gfs2/dir.c	2007-06-12 16:32:47.000000000 -0400
>+++ linux/fs/gfs2/dir.c	2007-06-21 17:45:01.000000000 -0400
>@@ -1498,9 +1498,11 @@ struct inode *gfs2_dir_search(struct ino
> 	if (dent) {
> 		if (IS_ERR(dent))
> 			return ERR_PTR(PTR_ERR(dent));
>-		inode = gfs2_inode_lookup(dir->i_sb,
>-					  be64_to_cpu(dent->de_inum.no_addr),
>-					  be16_to_cpu(dent->de_type));
>+		struct gfs2_inum_host ino;
>+		ino.no_formal_ino = be64_to_cpu(dent->de_inum.no_formal_ino);
>+		ino.no_addr = be64_to_cpu(dent->de_inum.no_addr);
>+		inode = gfs2_inode_lookup(dir->i_sb, &ino,
>+					  be16_to_cpu(dent->de_type), 0);
> 		brelse(bh);
> 		return inode;
> 	}
>--- gfs2-nmw/fs/gfs2/ops_export.c	2007-06-12 16:32:45.000000000 -0400
>+++ linux/fs/gfs2/ops_export.c	2007-06-21 17:52:36.000000000 -0400
>@@ -50,6 +50,10 @@ static struct dentry *gfs2_decode_fh(str
> 	fh_obj.imode 	= DT_UNKNOWN;
> 	memset(&parent, 0, sizeof(struct gfs2_inum));
> 
>+#if defined(NOT_NOW)
>+	printk("decode_fh, fh_len=%d, fh_type=%d\n", fh_len, fh_type);
>+#endif
>+
> 	switch (fh_len) {
> 	case GFS2_LARGE_FH_SIZE:
> 		parent.no_formal_ino = ((u64)be32_to_cpu(fh[4])) << 32;
>@@ -67,6 +71,11 @@ static struct dentry *gfs2_decode_fh(str
> 		return NULL;
> 	}
> 
>+#if defined(NOT_NOW)
>+	printk("no_formal_ino = %llu\n", this->no_formal_ino);
>+	printk("no_addr = %llu\n", this->no_addr);
>+#endif
>+
> 	return gfs2_export_ops.find_exported_dentry(sb, &fh_obj, &parent,
> 						    acceptable, context);
> }
>@@ -79,9 +88,23 @@ static int gfs2_encode_fh(struct dentry 
> 	struct super_block *sb = inode->i_sb;
> 	struct gfs2_inode *ip = GFS2_I(inode);
> 
>+#if defined(NOT_NOW)
>+	printk("encode_fh len=(%d) connectable=%d, ip=%p\n", 
>+			*len, connectable, ip);
>+#endif
>+
>+#if defined(REAL_CODE)
> 	if (*len < GFS2_SMALL_FH_SIZE ||
> 	    (connectable && *len < GFS2_LARGE_FH_SIZE))
> 		return 255;
>+#else
>+	if (*len < GFS2_SMALL_FH_SIZE) {
>+		return 255;
>+	}
>+	if (connectable && *len < GFS2_LARGE_FH_SIZE) {
>+		return 255;
>+	}
>+#endif
> 
> 	fh[0] = cpu_to_be32(ip->i_no_formal_ino >> 32);
> 	fh[1] = cpu_to_be32(ip->i_no_formal_ino & 0xFFFFFFFF);
>@@ -89,9 +112,21 @@ static int gfs2_encode_fh(struct dentry 
> 	fh[3] = cpu_to_be32(ip->i_no_addr & 0xFFFFFFFF);
> 	*len = GFS2_SMALL_FH_SIZE;
> 
>-	if (!connectable || inode == sb->s_root->d_inode)
>+#if defined(NOT_NOW)
>+	printk("i_no_formal_ino=%llu\n", ip->i_no_formal_ino);
>+	printk("i_no_addr=%llu\n", ip->i_no_addr);
>+#endif
>+
>+	if (!connectable || inode == sb->s_root->d_inode) 
> 		return *len;
> 
>+#if defined (NOT_NOW)
>+	if (inode == sb->s_root->d_inode) {
>+		printk("inode=%p, s_root=%p\n", inode, sb->s_root->d_inode);
>+		return *len;
>+	}
>+#endif
>+
> 	spin_lock(&dentry->d_lock);
> 	inode = dentry->d_parent->d_inode;
> 	ip = GFS2_I(inode);
>@@ -214,6 +249,14 @@ static struct dentry *gfs2_get_dentry(st
> 	inode = gfs2_ilookup(sb, inum->no_addr);
> 	if (inode) {
> 		if (GFS2_I(inode)->i_no_formal_ino != inum->no_formal_ino) {
>+			printk("no_formal_ino not match, ip=%p\n",
>+				GFS2_I(inode));
>+			printk("inode.formal=%llu inode.no_addr=%llu\n",
>+				GFS2_I(inode)->i_no_formal_ino,
>+				GFS2_I(inode)->i_no_addr);
>+			printk("inum.formal=%llu inum.no_addr=%llu\n",
>+				inum->no_formal_ino,
>+				inum->no_addr);
> 			iput(inode);
> 			return ERR_PTR(-ESTALE);
> 		}
>@@ -222,7 +265,7 @@ static struct dentry *gfs2_get_dentry(st
> 
> 	error = gfs2_glock_nq_num(sdp, inum->no_addr, &gfs2_inode_glops,
> 				  LM_ST_SHARED, LM_FLAG_ANY, &i_gh);
>-	if (error)
>+	if (error) 
> 		return ERR_PTR(error);
> 
> 	error = gfs2_rindex_hold(sdp, &ri_gh);
>@@ -245,7 +288,7 @@ static struct dentry *gfs2_get_dentry(st
> 	gfs2_glock_dq_uninit(&rgd_gh);
> 	gfs2_glock_dq_uninit(&ri_gh);
> 
>-	inode = gfs2_inode_lookup(sb, inum->no_addr, fh_obj->imode);
>+	inode = gfs2_inode_lookup(sb, inum, fh_obj->imode, 1);
> 	if (!inode)
> 		goto fail;
> 	if (IS_ERR(inode)) {
>@@ -258,6 +301,11 @@ static struct dentry *gfs2_get_dentry(st
> 		iput(inode);
> 		goto fail;
> 	}
>+
>+	/* add pick up the works we bypass in gfs2_inode_lookup */
>+	inode->i_mode = GFS2_I(inode)->i_inode.i_mode;
>+	(void) gfs2_inode_nfsbypass(inode);
>+
> 	if (GFS2_I(inode)->i_no_formal_ino != inum->no_formal_ino) {
> 		iput(inode);
> 		goto fail;
>@@ -289,6 +337,8 @@ fail_rindex:
> 
> fail:
> 	gfs2_glock_dq_uninit(&i_gh);
>+
>+fail_inode_lookup:
> 	return ERR_PTR(error);
> }
> 
>--- gfs2-nmw/fs/gfs2/ops_fstype.c	2007-06-12 16:32:45.000000000 -0400
>+++ linux/fs/gfs2/ops_fstype.c	2007-06-21 17:52:52.000000000 -0400
>@@ -234,18 +234,18 @@ fail:
> }
> 
> static inline struct inode *gfs2_lookup_root(struct super_block *sb,
>-					     u64 no_addr)
>+					     struct gfs2_inum_host *ino)
> {
>-	return gfs2_inode_lookup(sb, no_addr, DT_DIR);
>+	return gfs2_inode_lookup(sb, ino, DT_DIR, 0);
> }
> 
> static int init_sb(struct gfs2_sbd *sdp, int silent, int undo)
> {
> 	struct super_block *sb = sdp->sd_vfs;
> 	struct gfs2_holder sb_gh;
>-	u64 no_addr;
> 	struct inode *inode;
> 	int error = 0;
>+	struct gfs2_inum_host ino;
> 
> 	if (undo) {
> 		if (sb->s_root) {
>@@ -286,10 +286,11 @@ static int init_sb(struct gfs2_sbd *sdp,
> 	sb_set_blocksize(sb, sdp->sd_sb.sb_bsize);
> 
> 	/* Get the root inode */
>-	no_addr = sdp->sd_sb.sb_root_dir.no_addr;
>+	ino.no_addr = sdp->sd_sb.sb_root_dir.no_addr;
> 	if (sb->s_type == &gfs2meta_fs_type)
>-		no_addr = sdp->sd_sb.sb_master_dir.no_addr;
>-	inode = gfs2_lookup_root(sb, no_addr);
>+		ino.no_addr = sdp->sd_sb.sb_master_dir.no_addr;
>+	ino.no_formal_ino = 0;
>+	inode = gfs2_lookup_root(sb, &ino);
> 	if (IS_ERR(inode)) {
> 		error = PTR_ERR(inode);
> 		fs_err(sdp, "can't read in root inode: %d\n", error);
>@@ -442,11 +443,14 @@ static int init_inodes(struct gfs2_sbd *
> 	int error = 0;
> 	struct gfs2_inode *ip;
> 	struct inode *inode;
>+	struct gfs2_inum_host ino;
> 
> 	if (undo)
> 		goto fail_qinode;
> 
>-	inode = gfs2_lookup_root(sdp->sd_vfs, sdp->sd_sb.sb_master_dir.no_addr);
>+	ino.no_formal_ino = 0;
>+	ino.no_addr = sdp->sd_sb.sb_master_dir.no_addr;
>+	inode = gfs2_lookup_root(sdp->sd_vfs, &ino);
> 	if (IS_ERR(inode)) {
> 		error = PTR_ERR(inode);
> 		fs_err(sdp, "can't read in master directory: %d\n", error);
>--- gfs2-nmw/fs/gfs2/rgrp.c	2007-06-12 16:32:45.000000000 -0400
>+++ linux/fs/gfs2/rgrp.c	2007-06-21 17:53:40.000000000 -0400
>@@ -861,18 +861,18 @@ static struct inode *try_rgrp_unlink(str
> {
> 	struct inode *inode;
> 	u32 goal = 0;
>-	u64 ino;
>-
>+	struct gfs2_inum_host ino = {.no_formal_ino = 0};
>+	
> 	for(;;) {
> 		goal = rgblk_search(rgd, goal, GFS2_BLKST_UNLINKED,
> 				    GFS2_BLKST_UNLINKED);
> 		if (goal == 0)
> 			return 0;
>-		ino = goal + rgd->rd_data0;
>-		if (ino <= *last_unlinked)
>+		ino.no_addr = goal + rgd->rd_data0;
>+		if (ino.no_addr <= *last_unlinked)
> 			continue;
>-		*last_unlinked = ino;
>-		inode = gfs2_inode_lookup(rgd->rd_sbd->sd_vfs, ino, DT_UNKNOWN);
>+		*last_unlinked = ino.no_addr;
>+		inode = gfs2_inode_lookup(rgd->rd_sbd->sd_vfs, &ino, DT_UNKNOWN, 0);
> 		if (!IS_ERR(inode))
> 			return inode;
> 	}

Actions: View | Diff

Attachments on bug 243136: 157438 | 157580 | 157640 | 158063 | 158064 | 158065 | 158066