From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 257D6C83005 for ; Tue, 6 Jun 2023 22:54:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239806AbjFFWyU (ORCPT ); Tue, 6 Jun 2023 18:54:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239818AbjFFWyS (ORCPT ); Tue, 6 Jun 2023 18:54:18 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B314A10FF for ; Tue, 6 Jun 2023 15:54:15 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-30e412a852dso2458264f8f.0 for ; Tue, 06 Jun 2023 15:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philpotter-co-uk.20221208.gappssmtp.com; s=20221208; t=1686092054; x=1688684054; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=WXBt7JZzXPFqym4cCnJPiy0FfIw5Z8TRQSIrowmnJ2I=; b=y/DPog6+x5wGemOO9REl8wWYWJzD4iMG9s0P4L75NF501qmTUKPPbjSmSWL8hk0aIH AReatV0VgQpuPEy6beyF6HQkDPhvz8Py1F5RgMVT0C0THCFzB5taD4RxBSZDph6MVAXv zq8qdbifmeoev+y+EMmyAhIWBhOh2u6DiEV1dl9i3upSb4XjHzWkpz+fQyiyAoqhOt72 zBtDkRdlyEuvWSdP4/fWJTHUJreUQHAAXh+CUY+GkEkt/DXnJH0oIMni7ZM5hQbCL6t/ vr1JxaS/c8scaopC4pHtcsjEmJADUTWY/pzY58wjFip8DTTkk41ATmdEOAV6RcEEIrIx yFqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686092054; x=1688684054; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WXBt7JZzXPFqym4cCnJPiy0FfIw5Z8TRQSIrowmnJ2I=; b=IPImHOWH/JtkhJzse0k3OCL+DfxlVCdj8QO3jOuS79qNiUtt9BNJQPxJUElUa9YOio VoKgUB6vylNVOasEaRP3j0e83s2IywJK43ib4q+iTC1i1PG9HWUc/YysBSNjNggVBsOg YPPLhh7+vUmaxIVomXlEsQ7jhMKLqKhsQcOXDjCJZKIdEpzEm+PPxizP1IBxRcnV/1Qp VUP+iQKvVmkv00SoOohLEG8pCT2SHNxw2YGhiNwhodrt7F5oSnOXZYek0i0NHudeuTB+ ThSsTVusxrYFs93Hii1jDpDNW6ibjZ8DvLKbL3Vjdm6DzeKPr1FOsFs7CVsxc+HogxdO 8+cw== X-Gm-Message-State: AC+VfDyiCcfln5alO7pgQDMRoXxniXNyuLKO5/NzsVGTKcVp8Nkv4+Ht OlcVo7BOTAev8myPYIDQNcW1eg== X-Google-Smtp-Source: ACHHUZ5EAPVlS/dXZUIlff9U6cMvQ7qyxaaebNKkscChr1x36A65KZewdQ5EyNlkJSg7wU45zOpv+A== X-Received: by 2002:a5d:458c:0:b0:309:4e85:897e with SMTP id p12-20020a5d458c000000b003094e85897emr2751249wrq.17.1686092054063; Tue, 06 Jun 2023 15:54:14 -0700 (PDT) Received: from equinox (2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.a.1.e.e.d.f.d.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:dfde:e1a0::2]) by smtp.gmail.com with ESMTPSA id y6-20020a5d4ac6000000b002c70ce264bfsm13877769wrs.76.2023.06.06.15.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 15:54:13 -0700 (PDT) Date: Tue, 6 Jun 2023 23:54:11 +0100 From: Phillip Potter To: Christoph Hellwig Cc: Jens Axboe , Richard Weinberger , Josef Bacik , "Md. Haris Iqbal" , Jack Wang , Phillip Potter , Coly Li , Miquel Raynal , Vignesh Raghavendra , "Martin K. Petersen" , Chris Mason , David Sterba , Alexander Viro , Christian Brauner , "Rafael J. Wysocki" , Pavel Machek , dm-devel@redhat.com, linux-block@vger.kernel.org, linux-um@lists.infradead.org, linux-scsi@vger.kernel.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-nvme@lists.infradead.org, linux-btrfs@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-nilfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-pm@vger.kernel.org Subject: Re: [PATCH 03/31] cdrom: remove the unused mode argument to cdrom_ioctl Message-ID: References: <20230606073950.225178-1-hch@lst.de> <20230606073950.225178-4-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230606073950.225178-4-hch@lst.de> Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Tue, Jun 06, 2023 at 09:39:22AM +0200, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig > --- > drivers/cdrom/cdrom.c | 2 +- > drivers/cdrom/gdrom.c | 2 +- > drivers/scsi/sr.c | 2 +- > include/linux/cdrom.h | 4 ++-- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c > index e3eab319cb0474..245e5bbb05d41c 100644 > --- a/drivers/cdrom/cdrom.c > +++ b/drivers/cdrom/cdrom.c > @@ -3336,7 +3336,7 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, > * ATAPI / SCSI specific code now mainly resides in mmc_ioctl(). > */ > int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev, > - fmode_t mode, unsigned int cmd, unsigned long arg) > + unsigned int cmd, unsigned long arg) > { > void __user *argp = (void __user *)arg; > int ret; > diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c > index eaa2d5a90bc82f..14922403983e9e 100644 > --- a/drivers/cdrom/gdrom.c > +++ b/drivers/cdrom/gdrom.c > @@ -505,7 +505,7 @@ static int gdrom_bdops_ioctl(struct block_device *bdev, fmode_t mode, > int ret; > > mutex_lock(&gdrom_mutex); > - ret = cdrom_ioctl(gd.cd_info, bdev, mode, cmd, arg); > + ret = cdrom_ioctl(gd.cd_info, bdev, cmd, arg); > mutex_unlock(&gdrom_mutex); > > return ret; > diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c > index 61b83880e395a4..444c7efc14cba7 100644 > --- a/drivers/scsi/sr.c > +++ b/drivers/scsi/sr.c > @@ -539,7 +539,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, > scsi_autopm_get_device(sdev); > > if (cmd != CDROMCLOSETRAY && cmd != CDROMEJECT) { > - ret = cdrom_ioctl(&cd->cdi, bdev, mode, cmd, arg); > + ret = cdrom_ioctl(&cd->cdi, bdev, cmd, arg); > if (ret != -ENOSYS) > goto put; > } > diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h > index cc5717cb0fa8a8..4aea8c82d16971 100644 > --- a/include/linux/cdrom.h > +++ b/include/linux/cdrom.h > @@ -103,8 +103,8 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi, > /* the general block_device operations structure: */ > int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode); > extern void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode); > -extern int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev, > - fmode_t mode, unsigned int cmd, unsigned long arg); > +int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev, > + unsigned int cmd, unsigned long arg); > extern unsigned int cdrom_check_events(struct cdrom_device_info *cdi, > unsigned int clearing); > > -- > 2.39.2 > Thanks, looks good. Signed-off-by: Phillip Potter Regards, Phil