From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750939AbcAOBYi (ORCPT ); Thu, 14 Jan 2016 20:24:38 -0500 Received: from mail-pf0-f169.google.com ([209.85.192.169]:34903 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750808AbcAOBYg (ORCPT ); Thu, 14 Jan 2016 20:24:36 -0500 Date: Fri, 15 Jan 2016 10:25:45 +0900 From: Sergey Senozhatsky To: Jerome Marchand , Andrew Morton Cc: Minchan Kim , Sergey Senozhatsky , Sergey Senozhatsky , linux-kernel@vger.kernel.org Subject: Re: [PATCH] zram: don't call idr_remove() from zram_remove() Message-ID: <20160115012545.GB1993@swordfish> References: <1452776627-21662-1-git-send-email-jmarchan@redhat.com> <20160115004317.GA1993@swordfish> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160115004317.GA1993@swordfish> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On (01/15/16 09:43), Sergey Senozhatsky wrote: [..] > a nano nitpick to add curly braces in the else clause. > but, what is more important, may I please ask you to add -stable [4.2+] > > > Signed-off-by: Jerome Marchand > + Cc: > > and to resend the patch? > Jerome, please disregard my requests. Andrew has handled it. Thanks to both of you! -ss > idr added in 4.2 > https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tree/drivers/block/zram/zram_drv.c?id=refs/tags/v4.2 > > -ss > > > --- > > drivers/block/zram/zram_drv.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c > > index 47915d7..5e86e1d 100644 > > --- a/drivers/block/zram/zram_drv.c > > +++ b/drivers/block/zram/zram_drv.c > > @@ -1325,7 +1325,6 @@ static int zram_remove(struct zram *zram) > > > > pr_info("Removed device: %s\n", zram->disk->disk_name); > > > > - idr_remove(&zram_index_idr, zram->disk->first_minor); > > blk_cleanup_queue(zram->disk->queue); > > del_gendisk(zram->disk); > > put_disk(zram->disk); > > @@ -1367,9 +1366,10 @@ static ssize_t hot_remove_store(struct class *class, > > mutex_lock(&zram_index_mutex); > > > > zram = idr_find(&zram_index_idr, dev_id); > > - if (zram) > > + if (zram) { > > ret = zram_remove(zram); > > - else > > + idr_remove(&zram_index_idr, dev_id); > > + } else { > > ret = -ENODEV; > + } > > > > mutex_unlock(&zram_index_mutex); > > -- > > 2.5.0 > > >