From 34c5987bc55ab73a437b4885b263bf10edff6370 Mon Sep 17 00:00:00 2001
From: Joy Latten <latten@austin.ibm.com>
Date: Wed, 2 Apr 2008 14:36:09 +0800
Subject: [PATCH] --- yaml --- r: 87993 b: refs/heads/master c:
 1edcf2e1ee2babb011cfca80ad9d202e9c491669 h: refs/heads/master i:   87991:
 ce57e9c58195a35bb5f6d9696ac400a1a1931c9d v: v3

---
 [refs]              |  2 +-
 trunk/crypto/xcbc.c | 17 +++++++++--------
 trunk/fs/afs/cell.c |  1 -
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index ad81471a620a..41ba997700b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5f37c3252b174efdcdd808797a7c529064c95c0
+refs/heads/master: 1edcf2e1ee2babb011cfca80ad9d202e9c491669
diff --git a/trunk/crypto/xcbc.c b/trunk/crypto/xcbc.c
index 2feb0f239c38..b63b633e549c 100644
--- a/trunk/crypto/xcbc.c
+++ b/trunk/crypto/xcbc.c
@@ -116,13 +116,11 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc,
 	struct crypto_xcbc_ctx *ctx = crypto_hash_ctx_aligned(parent);
 	struct crypto_cipher *tfm = ctx->child;
 	int bs = crypto_hash_blocksize(parent);
-	unsigned int i = 0;
 
-	do {
-
-		struct page *pg = sg_page(&sg[i]);
-		unsigned int offset = sg[i].offset;
-		unsigned int slen = sg[i].length;
+	for (;;) {
+		struct page *pg = sg_page(sg);
+		unsigned int offset = sg->offset;
+		unsigned int slen = sg->length;
 
 		if (unlikely(slen > nbytes))
 			slen = nbytes;
@@ -182,8 +180,11 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc,
 			offset = 0;
 			pg++;
 		}
-		i++;
-	} while (nbytes>0);
+
+		if (!nbytes)
+			break;
+		sg = scatterwalk_sg_next(sg);
+	}
 
 	return 0;
 }
diff --git a/trunk/fs/afs/cell.c b/trunk/fs/afs/cell.c
index 584bb0f9c36a..788865df1bc9 100644
--- a/trunk/fs/afs/cell.c
+++ b/trunk/fs/afs/cell.c
@@ -138,7 +138,6 @@ struct afs_cell *afs_cell_create(const char *name, char *vllist)
 	cell = afs_cell_alloc(name, vllist);
 	if (IS_ERR(cell)) {
 		_leave(" = %ld", PTR_ERR(cell));
-		up_write(&afs_cells_sem);
 		return cell;
 	}