From patchwork Fri May 6 10:53:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 9031711 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9FD719F30C for ; Fri, 6 May 2016 10:56:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D4DBC20382 for ; Fri, 6 May 2016 10:56:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEF962038F for ; Fri, 6 May 2016 10:56:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758089AbcEFK4k (ORCPT ); Fri, 6 May 2016 06:56:40 -0400 Received: from mga01.intel.com ([192.55.52.88]:63881 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751695AbcEFK4j (ORCPT ); Fri, 6 May 2016 06:56:39 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 06 May 2016 03:56:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,586,1455004800"; d="scan'208";a="960167191" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by fmsmga001.fm.intel.com with ESMTP; 06 May 2016 03:56:37 -0700 Received: from nauris.fi.intel.com (nauris.localdomain [192.168.240.2]) by paasikivi.fi.intel.com (Postfix) with ESMTP id DEE1720A2C; Fri, 6 May 2016 13:56:34 +0300 (EEST) Received: by nauris.fi.intel.com (Postfix, from userid 1000) id 04E01201D4; Fri, 6 May 2016 13:53:35 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, hverkuil@xs4all.nl, mchehab@osg.samsung.com Subject: [RFC 04/22] media: Only requests in IDLE state may be deleted Date: Fri, 6 May 2016 13:53:13 +0300 Message-Id: <1462532011-15527-5-git-send-email-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462532011-15527-1-git-send-email-sakari.ailus@linux.intel.com> References: <1462532011-15527-1-git-send-email-sakari.ailus@linux.intel.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Prevent deleting queued requests. Also mark deleted requests as such by adding a new state for them. Signed-off-by: Sakari Ailus --- drivers/media/media-device.c | 14 ++++++++++++-- include/media/media-device.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 481e8e4..5b7bfcf 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -195,6 +195,7 @@ static long media_device_request_cmd(struct media_device *mdev, { struct media_device_fh *fh = media_device_fh(filp); struct media_device_request *req = NULL; + unsigned long flags; int ret; if (!mdev->ops || !mdev->ops->req_alloc || !mdev->ops->req_free) @@ -212,8 +213,17 @@ static long media_device_request_cmd(struct media_device *mdev, break; case MEDIA_REQ_CMD_DELETE: - media_device_request_delete(mdev, req); - ret = 0; + spin_lock_irqsave(&mdev->req_lock, flags); + if (req->state == MEDIA_DEVICE_REQUEST_STATE_IDLE) { + ret = 0; + req->state = MEDIA_DEVICE_REQUEST_STATE_DELETED; + } else { + ret = -EINVAL; + } + spin_unlock_irqrestore(&mdev->req_lock, flags); + + if (!ret) + media_device_request_delete(mdev, req); break; case MEDIA_REQ_CMD_APPLY: diff --git a/include/media/media-device.h b/include/media/media-device.h index acb2481..3167c52 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h @@ -268,6 +268,7 @@ struct media_device; enum media_device_request_state { MEDIA_DEVICE_REQUEST_STATE_IDLE, MEDIA_DEVICE_REQUEST_STATE_QUEUED, + MEDIA_DEVICE_REQUEST_STATE_DELETED, }; /**