From patchwork Tue Mar 25 13:47:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 3887911 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5D77FBF540 for ; Tue, 25 Mar 2014 13:47:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8794F20173 for ; Tue, 25 Mar 2014 13:47:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CCD420145 for ; Tue, 25 Mar 2014 13:47:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752740AbaCYNrw (ORCPT ); Tue, 25 Mar 2014 09:47:52 -0400 Received: from mail-ee0-f48.google.com ([74.125.83.48]:47438 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751854AbaCYNrv (ORCPT ); Tue, 25 Mar 2014 09:47:51 -0400 Received: by mail-ee0-f48.google.com with SMTP id b57so465223eek.35 for ; Tue, 25 Mar 2014 06:47:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ohqLH+re3/zclH+btuih4aHiIMufxWiMBnMv9tYEB5E=; b=hmCCcU8w1By5qARy9ZkXqIi1puFlTYw0oSaaoq7LIBH9RkU46rwPTfKEyw67fcAWDc bi4K2IYGMYOKDJxzusbaZnlcLUJXLPgO8hSwREXjl8tojPmigX+QdDEbZk9KlKPyfm5r Qud42UeUhQkuxqHjh6W5ZOwvkJ6yjgM/e1hdK6O7ukaHph9JdYSTLaPyA9NSQa8ImInk P5YCzDq2sJtXe5cX5O2+Wp/A9LbQJbfh0mFHZ7e7gIIsRHLRdpT7XdVpJReAJTcYHxEG 13HBtNUiTjiObCYTdA+G5+Fo7sHbk492Nsr9j27/j5oPqJ7kg2+4Qq835Q7aHkQQ5vR2 Ispg== X-Gm-Message-State: ALoCoQmYVb5m885pK3eMYRYK4gPnAa+dfWZBpS0qpF6EJXfA/YqfZIkWWQgH60wr0CsoBhnu1NpS X-Received: by 10.14.2.66 with SMTP id 42mr69105474eee.24.1395755270673; Tue, 25 Mar 2014 06:47:50 -0700 (PDT) Received: from localhost ([109.110.66.7]) by mx.google.com with ESMTPSA id bc51sm40336630eeb.22.2014.03.25.06.47.49 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 25 Mar 2014 06:47:50 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Olivier Bonvalet Subject: [PATCH] rbd: assert next_completion under completion_lock Date: Tue, 25 Mar 2014 15:47:48 +0200 Message-Id: <1395755268-11908-1-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP completion_lock is there specifically to protect next_completion. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- drivers/block/rbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index fbf41e058bfd..f044fab3da99 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2123,12 +2123,12 @@ static void rbd_img_obj_callback(struct rbd_obj_request *obj_request) rbd_assert(img_request->obj_request_count > 0); rbd_assert(which != BAD_WHICH); rbd_assert(which < img_request->obj_request_count); - rbd_assert(which >= img_request->next_completion); spin_lock_irq(&img_request->completion_lock); - if (which != img_request->next_completion) + if (which > img_request->next_completion) goto out; + rbd_assert(which == img_request->next_completion); for_each_obj_request_from(img_request, obj_request) { rbd_assert(more); rbd_assert(which < img_request->obj_request_count);