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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 949AAC4332F for ; Fri, 1 Oct 2021 18:16:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B2E5611BD for ; Fri, 1 Oct 2021 18:16:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355503AbhJASSX (ORCPT ); Fri, 1 Oct 2021 14:18:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229755AbhJASSW (ORCPT ); Fri, 1 Oct 2021 14:18:22 -0400 Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E0BFC06177D for ; Fri, 1 Oct 2021 11:16:37 -0700 (PDT) Received: by mail-qk1-x74a.google.com with SMTP id m1-20020a05620a290100b0045e5e0b11e6so17531808qkp.23 for ; Fri, 01 Oct 2021 11:16:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=hcUl3oIGrwuelQo171PiNoZTnRPOWfpk2tqnEmzSPUM=; b=U3DVvg5YX2tw78WA0Ma0btjs8nGR6214yfthJjRFJzABQJAr4AKKvnTiDKhJD4yGJE mTNP93z3WZPREcWF3MuzV6X4LtvxjnMVSgVAy2kQcOtDjbm4mWMLarJ12xaUG3PMPKS8 WuLXtTzxigOHJLl6X15GLtjRX63mRhUQs9PB5QgnayqT+3cdkxSo60QSTsScYEZkCVJB rh9pXGZkHxot98fMChmh6P3mB6SoxRkshnAOcN784IEP6U2BKqp4/POJpkg0UuFXbz5p at7mNmpzAAA+sqsOulSp1+0ddZ6LYrmpVgFZHFF0M8Ydh2d8YXfIjHV5SvZuVbgsML/Y Didw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=hcUl3oIGrwuelQo171PiNoZTnRPOWfpk2tqnEmzSPUM=; b=HXqE6PFg704Lar4E/JwJTY3SRGY+MayuISwfkiwY33RCqBPwH2X0h8XhrdGT1TOVWz HaQHgBFp2AP//B59rZjYHPT3ai8Ay3wqiflfZu9Ds1OXQ1A925TeTghpgxOJr0mFAqRq FZAXuZF4+MPvtVl9Ct0J9R6MGhFOx/UfSoC4yVNw3h8qcJCn/+TIbsbw9bAR3YPu0noj /wO0Oh0luJx8GgWugKDe/X8JlAHVhP9aVO7nlZBwOks9ZS59PGhTOFvPF95vp6EAIrjC VvA58IiB5p/tFoQdCCxyN0vR1Sy7rGeZA4emCM9+hBMasgw9oPVpOeQvIML/W3f5ykOR MJwA== X-Gm-Message-State: AOAM5315DxIU8KzNWEZtfR4AmVxQvIO+v3jQ96WoOqG+feY/OfLY9O43 OaCakbHfkhLl/nBVZ5YQYLw3KqUnJhyx X-Google-Smtp-Source: ABdhPJzDnSE+EX9s57FI34EkdjuBVpq4eMQ7zpwsHvBPxiVUB2waooHWFd5M88cumNrwRUlCxamXk2cBZbwo X-Received: from bg.sfo.corp.google.com ([2620:15c:11a:202:8b2d:acba:ea70:44e7]) (user=bgeffon job=sendgmr) by 2002:a05:6214:226c:: with SMTP id gs12mr5905396qvb.58.1633112196862; Fri, 01 Oct 2021 11:16:36 -0700 (PDT) Date: Fri, 1 Oct 2021 11:16:27 -0700 Message-Id: <20211001181627.394921-1-bgeffon@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.33.0.800.g4c38ced690-goog Subject: [PATCH] zram: Allow backing device to be assigned after init From: Brian Geffon To: Andrew Morton Cc: Minchan Kim , Nitin Gupta , Sergey Senozhatsky , Jonathan Corbet , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-block@vger.kernel.org, Suleiman Souhlal , Jesse Barnes , Brian Geffon Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There does not appear to be a technical reason to not allow the zram backing device to be assigned after the zram device is initialized. This change will allow for the backing device to be assigned as long as no backing device is already assigned. In that event backing_dev would return -EEXIST. Signed-off-by: Brian Geffon --- 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 fcaf2750f68f..12b4555ee079 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -462,9 +462,9 @@ static ssize_t backing_dev_store(struct device *dev, return -ENOMEM; down_write(&zram->init_lock); - if (init_done(zram)) { - pr_info("Can't setup backing device for initialized device\n"); - err = -EBUSY; + if (zram->backing_dev) { + pr_info("Backing device is already assigned\n"); + err = -EEXIST; goto out; } -- 2.33.0.800.g4c38ced690-goog