---

yaml
---
r: 76964
b: refs/heads/master
c: 2fe5c1d
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ec373cf33533af6c50828a62f6b305c2d7fa931
+refs/heads/master: 2fe5c1d7eb88830b09c863a4b5b3279dc120f3af

trunk/fs/ocfs2/buffer_head_io.c

@@ -79,7 +79,7 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
 		 * information for this bh as it's not marked locally
 		 * uptodate. */
 		ret = -EIO;
-		brelse(bh);
+		put_bh(bh);
 	}
 
 	mutex_unlock(&OCFS2_I(inode)->ip_io_mutex);
@@ -256,7 +256,7 @@ int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
 				 * for this bh as it's not marked locally
 				 * uptodate. */
 				status = -EIO;
-				brelse(bh);
+				put_bh(bh);
 				bhs[i] = NULL;
 				continue;
 			}
@@ -334,7 +334,7 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb,
 
 	if (!buffer_uptodate(bh)) {
 		ret = -EIO;
-		brelse(bh);
+		put_bh(bh);
 	}
 
 out:

trunk/fs/ocfs2/resize.c

@@ -257,8 +257,7 @@ static void ocfs2_update_super_and_backups(struct inode *inode,
 		ret = update_backups(inode, clusters, super_bh->b_data);
 
 out:
-	if (super_bh)
-		brelse(super_bh);
+	brelse(super_bh);
 	if (ret)
 		printk(KERN_WARNING "ocfs2: Failed to update super blocks on %s"
 			" during fs resize. This condition is not fatal,"
@@ -380,11 +379,8 @@ int ocfs2_group_extend(struct inode * inode, int new_clusters)
 out_commit:
 	ocfs2_commit_trans(osb, handle);
 out_unlock:
-	if (group_bh)
-		brelse(group_bh);
-
-	if (main_bm_bh)
-		brelse(main_bm_bh);
+	brelse(group_bh);
+	brelse(main_bm_bh);
 
 	ocfs2_inode_unlock(main_bm_inode, 1);
 
@@ -623,11 +619,8 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
 out_commit:
 	ocfs2_commit_trans(osb, handle);
 out_unlock:
-	if (group_bh)
-		brelse(group_bh);
-
-	if (main_bm_bh)
-		brelse(main_bm_bh);
+	brelse(group_bh);
+	brelse(main_bm_bh);
 
 	ocfs2_inode_unlock(main_bm_inode, 1);