From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 24 Jul 2008 04:27:19 +0000 (-0700)
Subject: mapping_set_error: add unlikely()
X-Git-Tag: v2.6.27-rc1~815
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2185e69f680ae8c8496b6fc15e20c889d5b39b67;p=linux-2.6-omap-h63xx.git

mapping_set_error: add unlikely()

This is called on a per-page basis and in the vast majority of cases
`error' is zero.

Cc: Guillaume Chazarain <guichaz@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index d2fca802f80..ee1ec2c7723 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -22,7 +22,7 @@
 
 static inline void mapping_set_error(struct address_space *mapping, int error)
 {
-	if (error) {
+	if (unlikely(error)) {
 		if (error == -ENOSPC)
 			set_bit(AS_ENOSPC, &mapping->flags);
 		else