aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNick Bowler <nbowler@elliptictech.com>2012-12-17 16:05:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-17 17:15:28 -0800
commit6fd59a83b9261fa53eaf98fb5514abba504a3ea3 (patch)
tree08dfeef55544c0c30e1567618f62ae771feeac53 /lib
parente71ec593201e1b367b5f22955e3db49e3c562e67 (diff)
downloadvexpress-lsk-6fd59a83b9261fa53eaf98fb5514abba504a3ea3.tar.gz
scatterlist: don't BUG when we can trivially return a proper error.
There is absolutely no reason to crash the kernel when we have a perfectly good return value already available to use for conveying failure status. Let's return an error code instead of crashing the kernel: that sounds like a much better plan. [akpm@linux-foundation.org: s/E2BIG/EINVAL/] Signed-off-by: Nick Bowler <nbowler@elliptictech.com> Cc: Maxim Levitsky <maximlevitsky@gmail.com> Cc: Tejun Heo <tj@kernel.org> Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/scatterlist.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index 3675452b23c..7874b01e816 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -248,7 +248,8 @@ int __sg_alloc_table(struct sg_table *table, unsigned int nents,
unsigned int left;
#ifndef ARCH_HAS_SG_CHAIN
- BUG_ON(nents > max_ents);
+ if (WARN_ON_ONCE(nents > max_ents))
+ return -EINVAL;
#endif
memset(table, 0, sizeof(*table));