rpms/kernel/devel linux-2.6-ext4-jbd2-patch-queue.patch,1.4,1.5

[Eric Sandeen (sandeen)]

Author: sandeen

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6695

Modified Files:
	linux-2.6-ext4-jbd2-patch-queue.patch 
Log Message:
Fix unintialized variable that snuck in from upstream.
Patch to fix it sent upstream, too.


linux-2.6-ext4-jbd2-patch-queue.patch:

Index: linux-2.6-ext4-jbd2-patch-queue.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ext4-jbd2-patch-queue.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-ext4-jbd2-patch-queue.patch	28 Jan 2008 18:58:11 -0000	1.4
+++ linux-2.6-ext4-jbd2-patch-queue.patch	28 Jan 2008 19:16:11 -0000	1.5
@@ -6657,7 +6657,7 @@
 +}
 --- /dev/null
 +++ linux-2.6.24-rc6-mm1/fs/ext4/mballoc.c
-@@ -0,0 +1,4552 @@
+@@ -0,0 +1,4553 @@
 +/*
 + * Copyright (c) 2003-2006, Cluster File Systems, Inc, info at clusterfs.com
 + * Written by Alex Tomas <alex at clusterfs.com>
@@ -11065,7 +11065,7 @@
 +			unsigned long block, unsigned long count,
 +			int metadata, unsigned long *freed)
 +{
-+	struct buffer_head *bitmap_bh;
++	struct buffer_head *bitmap_bh = NULL;
 +	struct super_block *sb = inode->i_sb;
 +	struct ext4_allocation_context ac;
 +	struct ext4_group_desc *gdp;
@@ -11206,7 +11206,8 @@
 +	}
 +	sb->s_dirt = 1;
 +error_return:
-+	put_bh(bitmap_bh);
++	if (bitmap_bh)
++		put_bh(bitmap_bh);
 +	ext4_std_error(sb, err);
 +	return;
 +}