Attachment 878667 Details for Bug 1066181 – Version of the patch that is posted to cluster-devel

[patch] Version of the patch that is posted to cluster-devel

bz1066181.patch (text/plain), 1.35 KB, created by Ben Marzinski on 2014-03-25 20:09:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Marzinski

Created: 2014-03-25 20:09:13 UTC

Size: 1.35 KB

patch

obsolete

>diff --git a/gfs-kernel/src/gfs/ops_super.c b/gfs-kernel/src/gfs/ops_super.c
>index c111a2e..0d17735 100644
>--- a/gfs-kernel/src/gfs/ops_super.c
>+++ b/gfs-kernel/src/gfs/ops_super.c
>@@ -39,6 +39,7 @@
> #include "super.h"
> #include "sys.h"
> #include "mount.h"
>+#include "trans.h"
> 
> /**
>  * gfs_write_inode - Make sure the inode is stable on the disk
>@@ -51,14 +52,50 @@
> static int
> gfs_write_inode(struct inode *inode, int sync)
> {
>+	int ret = 0;
> 	struct gfs_inode *ip = get_v2ip(inode);
>+	struct buffer_head *dibh;
>+	struct gfs_holder i_gh;
>+	int need_unlock = 0;
>+
>+	if (!ip)
>+		return 0;
> 
> 	atomic_inc(&ip->i_sbd->sd_ops_super);
> 
>-	if (ip && sync)
>+	if (current->flags & PF_MEMALLOC)
>+		goto do_flush;
>+
>+	if (!gfs_glock_is_locked_by_me(ip->i_gl)) {
>+		ret = gfs_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &i_gh);
>+		if (ret)
>+			goto do_flush;
>+		need_unlock = 1;
>+	}
>+	/* Trans may require:
>+	   one dinode block. */
>+	ret = gfs_trans_begin(ip->i_sbd, 1, 0);
>+	if (ret)
>+		goto do_unlock;
>+
>+	ret = gfs_get_inode_buffer(ip, &dibh);
>+	if (ret == 0) {
>+		gfs_inode_attr_out(ip);
>+		gfs_trans_add_bh(ip->i_gl, dibh);
>+		gfs_dinode_out(&ip->i_di, dibh->b_data);
>+		brelse(dibh);
>+	}
>+
>+	gfs_trans_end(ip->i_sbd);
>+
>+do_unlock:
>+	if (need_unlock)
>+		gfs_glock_dq_uninit(&i_gh);
>+do_flush:
>+	if (sync)
> 		gfs_log_flush_glock(ip->i_gl, 0);
> 
>-	return 0;
>+	return ret;
> }
> 
> /**

Actions: View | Diff

Attachments on bug 1066181: 864329 | 878304 | 878667 | 900627 | 902772