浏览代码

GFS2: Move journal live test at transaction start

There seems little point grabbing the transaction glock
only to have to release it again if the journal isn't
live. This moves the test earlier to avoid grabbing the lock
when we don't need it in the first place.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Steven Whitehouse 16 年之前
父节点
当前提交
a1c0643ff9
共有 1 个文件被更改,包括 3 次插入6 次删除
  1. 3 6
      fs/gfs2/trans.c

+ 3 - 6
fs/gfs2/trans.c

@@ -33,6 +33,9 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,
 	BUG_ON(current->journal_info);
 	BUG_ON(current->journal_info);
 	BUG_ON(blocks == 0 && revokes == 0);
 	BUG_ON(blocks == 0 && revokes == 0);
 
 
+	if (!test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags))
+		return -EROFS;
+
 	tr = kzalloc(sizeof(struct gfs2_trans), GFP_NOFS);
 	tr = kzalloc(sizeof(struct gfs2_trans), GFP_NOFS);
 	if (!tr)
 	if (!tr)
 		return -ENOMEM;
 		return -ENOMEM;
@@ -54,12 +57,6 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,
 	if (error)
 	if (error)
 		goto fail_holder_uninit;
 		goto fail_holder_uninit;
 
 
-	if (!test_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags)) {
-		tr->tr_t_gh.gh_flags |= GL_NOCACHE;
-		error = -EROFS;
-		goto fail_gunlock;
-	}
-
 	error = gfs2_log_reserve(sdp, tr->tr_reserved);
 	error = gfs2_log_reserve(sdp, tr->tr_reserved);
 	if (error)
 	if (error)
 		goto fail_gunlock;
 		goto fail_gunlock;