From f90776280de62e6e115237365905bba0e37215be Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 23 Aug 2010 13:36:20 +0200
Subject: [PATCH] --- yaml --- r: 210521 b: refs/heads/master c:
 220eb7fd984bfc7e6b4005fdf32efe9cd8af7cf2 h: refs/heads/master i:   210519:
 c4e40779523ab3f2e92890bc58851c71240995a8 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/bio-integrity.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e58d7537f0bc..7f1ec278a4a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72f465033702ebfe20db8f50edaad59f0f38b0f5
+refs/heads/master: 220eb7fd984bfc7e6b4005fdf32efe9cd8af7cf2
diff --git a/trunk/fs/bio-integrity.c b/trunk/fs/bio-integrity.c
index a8f4cc679983..4d0ff5ee27b8 100644
--- a/trunk/fs/bio-integrity.c
+++ b/trunk/fs/bio-integrity.c
@@ -416,7 +416,7 @@ int bio_integrity_prep(struct bio *bio)
 	buf = kmalloc(len, GFP_NOIO | q->bounce_gfp);
 	if (unlikely(buf == NULL)) {
 		printk(KERN_ERR "could not allocate integrity buffer\n");
-		return -EIO;
+		return -ENOMEM;
 	}
 
 	end = (((unsigned long) buf) + len + PAGE_SIZE - 1) >> PAGE_SHIFT;