summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-03-02 15:25:46 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-03-07 14:27:10 +1100
commita3106a6281e30079c9102f34e80721c2a2f9f3c5 (patch)
tree7e73fbb279658fae3214999fe1d3150a2f282ce2 /fs
parentd8e64d4aee52a1f69530d2284dd6b14887a508f8 (diff)
aio-use-cancellation-list-lazily-fix-fix
Kent's on Krack Cc: Kent Overstreet <koverstreet@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/aio.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/aio.c b/fs/aio.c
index ed42871059e4..8c31d1e1fae1 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -254,7 +254,6 @@ static int kiocb_cancel(struct kioctx *ctx, struct kiocb *kiocb,
if (!cancel || cancel == KIOCB_CANCELLED)
return ret;
- BUG();
old = cancel;
cancel = cmpxchg(&kiocb->ki_cancel, old, KIOCB_CANCELLED);
} while (cancel != old);