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 X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 325FAC43461 for ; Thu, 17 Sep 2020 17:26:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A9338221E7 for ; Thu, 17 Sep 2020 17:26:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9338221E7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 20BE26B0088; Thu, 17 Sep 2020 13:26:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BAF56B008A; Thu, 17 Sep 2020 13:26:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0F78E6B008C; Thu, 17 Sep 2020 13:26:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0047.hostedemail.com [216.40.44.47]) by kanga.kvack.org (Postfix) with ESMTP id EE2F86B0088 for ; Thu, 17 Sep 2020 13:26:55 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id AF0E41DEE for ; Thu, 17 Sep 2020 17:26:55 +0000 (UTC) X-FDA: 77273233590.04.tent97_560a69e27124 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id 8861A800CDAB for ; Thu, 17 Sep 2020 17:26:55 +0000 (UTC) X-HE-Tag: tent97_560a69e27124 X-Filterd-Recvd-Size: 5990 Received: from mail-oi1-f196.google.com (mail-oi1-f196.google.com [209.85.167.196]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Thu, 17 Sep 2020 17:26:55 +0000 (UTC) Received: by mail-oi1-f196.google.com with SMTP id a3so3383487oib.4 for ; Thu, 17 Sep 2020 10:26:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ti1DSc22l1OTXWw3UqGRGhr/gUl2umii2yhtCBxuHDg=; b=It4vBptyBOfdTEHZJRCxri41a2v6HE4wCKUS7ubQA6+qVdIukGW85Bwas0pQn+Uai9 b7ngELD0lBHaAC1PqxoTH0Dz9NX3uFiXCUDdkWkirHsHbBV+badkmAfeFvxyXuIUMvZc FUbTcABBImujvtx9FgqJM4/MlQwhxl7bhbJ2wmQbs4tipktSkB0Qjbxz/eNwFQJorVvB yah8wscKRNXuaCD2XhPlx+KngHY2XeLImP/aunNwWUShHqJMpkTSbMyz6Ey5t1TQF9mD wxQM7CYAFnfSnHhjGLnPQu7OHSn6xHQtSAHIaToOrcI5vwcou1dLGLHQNXgftvkmmPZ+ qa/g== X-Gm-Message-State: AOAM532+piaOEQuVzq4jv427tYT1L4GJSOdpluMWvUIQG4gA6ozTK2qM C0fNlx4yeehdfylRs+JfO1Urm8oIxGgCE05M1pg= X-Google-Smtp-Source: ABdhPJyxWcNaiYYx/PgKQVmfX9UkChVN7amPa6jbDo4mZp02WYuGpLkS7XSRAAssnMS4AZvrpL/9pXv3g76gc1DAJ3I= X-Received: by 2002:aca:df84:: with SMTP id w126mr7311183oig.103.1600363614359; Thu, 17 Sep 2020 10:26:54 -0700 (PDT) MIME-Version: 1.0 References: <20200917165720.3285256-1-hch@lst.de> <20200917165720.3285256-12-hch@lst.de> In-Reply-To: <20200917165720.3285256-12-hch@lst.de> From: "Rafael J. Wysocki" Date: Thu, 17 Sep 2020 19:26:43 +0200 Message-ID: Subject: Re: [PATCH 11/14] PM: rewrite is_hibernate_resume_dev to not require an inode To: Christoph Hellwig Cc: Jens Axboe , Josef Bacik , Minchan Kim , Stefan Haberland , Jan Hoeppner , Joseph Qi , "Rafael J. Wysocki" , Pavel Machek , Len Brown , Andrew Morton , Linux Kernel Mailing List , nbd@other.debian.org, "open list:LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)" , linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com, Linux PM , Linux Memory Management List , linux-block@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Sep 17, 2020 at 7:24 PM Christoph Hellwig wrote: > > Just check the dev_t to help simplifying the code. > > Signed-off-by: Christoph Hellwig Acked-by: Rafael J. Wysocki > --- > fs/block_dev.c | 2 +- > include/linux/suspend.h | 4 ++-- > kernel/power/user.c | 12 ++++++------ > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/fs/block_dev.c b/fs/block_dev.c > index 1a9325f4315769..2898d69be6b3e4 100644 > --- a/fs/block_dev.c > +++ b/fs/block_dev.c > @@ -1885,7 +1885,7 @@ ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from) > if (bdev_read_only(I_BDEV(bd_inode))) > return -EPERM; > > - if (IS_SWAPFILE(bd_inode) && !is_hibernate_resume_dev(bd_inode)) > + if (IS_SWAPFILE(bd_inode) && !is_hibernate_resume_dev(bd_inode->i_rdev)) > return -ETXTBSY; > > if (!iov_iter_count(from)) > diff --git a/include/linux/suspend.h b/include/linux/suspend.h > index cb9afad82a90c8..8af13ba60c7e45 100644 > --- a/include/linux/suspend.h > +++ b/include/linux/suspend.h > @@ -473,9 +473,9 @@ static inline int hibernate_quiet_exec(int (*func)(void *data), void *data) { > #endif /* CONFIG_HIBERNATION */ > > #ifdef CONFIG_HIBERNATION_SNAPSHOT_DEV > -int is_hibernate_resume_dev(const struct inode *); > +int is_hibernate_resume_dev(dev_t dev); > #else > -static inline int is_hibernate_resume_dev(const struct inode *i) { return 0; } > +static inline int is_hibernate_resume_dev(dev_t dev) { return 0; } > #endif > > /* Hibernation and suspend events */ > diff --git a/kernel/power/user.c b/kernel/power/user.c > index d5eedc2baa2a10..b5815685b944fe 100644 > --- a/kernel/power/user.c > +++ b/kernel/power/user.c > @@ -35,12 +35,12 @@ static struct snapshot_data { > bool ready; > bool platform_support; > bool free_bitmaps; > - struct inode *bd_inode; > + dev_t dev; > } snapshot_state; > > -int is_hibernate_resume_dev(const struct inode *bd_inode) > +int is_hibernate_resume_dev(dev_t dev) > { > - return hibernation_available() && snapshot_state.bd_inode == bd_inode; > + return hibernation_available() && snapshot_state.dev == dev; > } > > static int snapshot_open(struct inode *inode, struct file *filp) > @@ -101,7 +101,7 @@ static int snapshot_open(struct inode *inode, struct file *filp) > data->frozen = false; > data->ready = false; > data->platform_support = false; > - data->bd_inode = NULL; > + data->dev = 0; > > Unlock: > unlock_system_sleep(); > @@ -117,7 +117,7 @@ static int snapshot_release(struct inode *inode, struct file *filp) > > swsusp_free(); > data = filp->private_data; > - data->bd_inode = NULL; > + data->dev = 0; > free_all_swap_pages(data->swap); > if (data->frozen) { > pm_restore_gfp_mask(); > @@ -245,7 +245,7 @@ static int snapshot_set_swap_area(struct snapshot_data *data, > if (data->swap < 0) > return -ENODEV; > > - data->bd_inode = bdev->bd_inode; > + data->dev = bdev->bd_dev; > bdput(bdev); > return 0; > } > -- > 2.28.0 >