diff --git a/[refs] b/[refs]
index 359edf70ece8..84397c75d9bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9023cb7e8564d95a1893f8cb6895a293be9a71fe
+refs/heads/master: 2185e69f680ae8c8496b6fc15e20c889d5b39b67
diff --git a/trunk/include/linux/pagemap.h b/trunk/include/linux/pagemap.h
index d2fca802f809..ee1ec2c7723c 100644
--- a/trunk/include/linux/pagemap.h
+++ b/trunk/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