diff --git a/[refs] b/[refs]
index 1691175e5927..a4044f044c45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1f724e4b523d444c5a598d74505aefa3d6844d2
+refs/heads/master: 694189328a7e566cb84bd3205503a42b60e87882
diff --git a/trunk/fs/xfs/linux-2.6/xfs_aops.c b/trunk/fs/xfs/linux-2.6/xfs_aops.c
index b493c63976cd..793908a8a09b 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_aops.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_aops.c
@@ -229,7 +229,7 @@ xfs_end_io(
 {
 	xfs_ioend_t	*ioend = container_of(work, xfs_ioend_t, io_work);
 	struct xfs_inode *ip = XFS_I(ioend->io_inode);
-	int		error;
+	int		error = 0;
 
 	/*
 	 * For unwritten extents we need to issue transactions to convert a