Attachment 157438 Details for Bug 243136 – Draft version of GFS2 NFS patch

[patch] Draft version of GFS2 NFS patch

gfs2_nfs.patch (text/plain), 4.80 KB, created by Wendy Cheng on 2007-06-20 02:45:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wendy Cheng

Created: 2007-06-20 02:45:17 UTC

Size: 4.80 KB

patch

obsolete

>--- gfs2-nmw/fs/gfs2/inode.h	2007-06-12 16:32:46.000000000 -0400
>+++ linux/fs/gfs2/inode.h	2007-06-13 16:37:18.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, u64 no_addr, 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-13 17:13:18.000000000 -0400
>@@ -86,7 +86,7 @@ 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, u64 no_addr, unsigned int type, int where)
> {
> 	struct inode *inode = gfs2_iget(sb, no_addr);
> 	struct gfs2_inode *ip = GFS2_I(inode);
>@@ -126,6 +126,15 @@ 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) {
>+				printk("NFS BYPASS\n");
>+				return inode;
>+			}
>+		}
>+
> 		if (type == DT_UNKNOWN) {
> 			struct gfs2_holder gh;
> 			error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
>@@ -248,6 +257,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 +947,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.no_addr, 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-13 16:28:36.000000000 -0400
>@@ -1500,7 +1500,7 @@ struct inode *gfs2_dir_search(struct ino
> 			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));
>+					  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-13 16:47:30.000000000 -0400
>@@ -245,7 +245,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->no_addr, fh_obj->imode, 1);
> 	if (!inode)
> 		goto fail;
> 	if (IS_ERR(inode)) {
>@@ -258,6 +258,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 +294,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-13 16:29:50.000000000 -0400
>@@ -236,7 +236,7 @@ fail:
> static inline struct inode *gfs2_lookup_root(struct super_block *sb,
> 					     u64 no_addr)
> {
>-	return gfs2_inode_lookup(sb, no_addr, DT_DIR);
>+	return gfs2_inode_lookup(sb, no_addr, DT_DIR, 0);
> }
> 
> static int init_sb(struct gfs2_sbd *sdp, int silent, int undo)
>--- gfs2-nmw/fs/gfs2/rgrp.c	2007-06-12 16:32:45.000000000 -0400
>+++ linux/fs/gfs2/rgrp.c	2007-06-13 16:30:33.000000000 -0400
>@@ -872,7 +872,7 @@ static struct inode *try_rgrp_unlink(str
> 		if (ino <= *last_unlinked)
> 			continue;
> 		*last_unlinked = ino;
>-		inode = gfs2_inode_lookup(rgd->rd_sbd->sd_vfs, ino, DT_UNKNOWN);
>+		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