Skip to contentSkip to conversation

GFS2: A couple more small fixes

PATCH New Steven Whitehouse 1 participant 3 messages Apr 21, 2009 GFS2 file system

lore
Share & tools
lore
#0 lore raw

Both of the following patches are pretty small. The patch to clear the dirty bit at the end of the glock flush is the more important one for now,

Steve.

#1 lore raw

PATCH 1/2 GFS2: Clear dirty bit at end of inode glock sync

The dirty bit can get set during the inode glock sync. Its too complicated to change that at the moment, so this is the quick fix - to clear the bit again at the end of the function.

fs/gfs2/glops.c +6 -0
index bf23a62..70f87f4 100644
@@ -156,6 +156,12 @@ static void inode_go_sync(struct gfs2_glock *gl)
 	error = filemap_fdatawait(metamapping);
 	mapping_set_error(metamapping, error);
 	gfs2_ail_empty_gl(gl);
+	/*
+	 * Writeback of the data mapping may cause the dirty flag to be set
+	 * so we have to clear it again here.
+	 */
+	smp_mb__before_clear_bit();
+	clear_bit(GLF_DIRTY, &gl->gl_flags);
 }
 
 /**
Signature · 1 line
1.6.0.6
#2 lore raw

PATCH 2/2 GFS2: Fix page_mkwrite() return code

This allows for the possibility of returning VM_FAULT_OOM as well as VM_FAULT_SIGBUS. This ensures that the correct action is taken.

fs/gfs2/ops_file.c +3 -1
index 101caf3..5d82e91 100644
@@ -413,7 +413,9 @@ out_unlock:
 	gfs2_glock_dq(&gh);
 out:
 	gfs2_holder_uninit(&gh);
-	if (ret)
+	if (ret == -ENOMEM)
+		ret = VM_FAULT_OOM;
+	else if (ret)
 		ret = VM_FAULT_SIGBUS;
 	return ret;
 }
Signature · 1 line
1.6.0.6