summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@parallels.com>2012-05-29 15:07:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-29 16:22:27 -0700
commit04eac7ffdea1090f81bc33bd8f4bf072b1fe5bdb (patch)
tree8ee96376aa4c1d21500dcaa52e074ef5dfe71a58
parent2f3479b1478e223f142fe9cd27a2d2a4c3573c53 (diff)
downloadlinux-3.10-04eac7ffdea1090f81bc33bd8f4bf072b1fe5bdb.tar.gz
linux-3.10-04eac7ffdea1090f81bc33bd8f4bf072b1fe5bdb.tar.bz2
linux-3.10-04eac7ffdea1090f81bc33bd8f4bf072b1fe5bdb.zip
rescounter: remove __must_check from res_counter_charge_nofail()
Since we will succeed with the allocation no matter what, there isn't a need to use __must_check with it. It can very well be optional. Signed-off-by: Glauber Costa <glommer@parallels.com> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Cc: Michal Hocko <mhocko@suse.cz> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ying Han <yinghan@google.com> Reviewed-by: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/res_counter.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h
index 5de7a146ead..7d7fbe2ef78 100644
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
@@ -119,7 +119,7 @@ int __must_check res_counter_charge_locked(struct res_counter *counter,
unsigned long val, bool force);
int __must_check res_counter_charge(struct res_counter *counter,
unsigned long val, struct res_counter **limit_fail_at);
-int __must_check res_counter_charge_nofail(struct res_counter *counter,
+int res_counter_charge_nofail(struct res_counter *counter,
unsigned long val, struct res_counter **limit_fail_at);
/*