From patchwork Fri Jun 9 09:31:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Mikhalitsyn X-Patchwork-Id: 105524 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp849145vqr; Fri, 9 Jun 2023 03:37:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6/AFjStrWBjdHwH6aHTohllOiWOodGums+sB4/ZfzPbkG+RFQu7cDNMrh2cu6PbE2fwUJ2 X-Received: by 2002:a05:6a00:23d4:b0:655:a7b4:2c8f with SMTP id g20-20020a056a0023d400b00655a7b42c8fmr6160719pfc.11.1686307021849; Fri, 09 Jun 2023 03:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686307021; cv=none; d=google.com; s=arc-20160816; b=zwNdbT8aKKQVtxRPBfVABX1NS8jPUmEpg/hEgBm4QNhslMaZb8B2KKpWsQ/u2dT2W2 hAB6dUDA4f691Y6C49Sg3Z1OHKfyF35N8BLjlpi8Ij7Tu/jAIm/0nrvMEkdEUA0KEblv R3qCOu7vJ+QgumXiVXSEvIqFi5U2zu+0eLrsA9IfBwWo0gEfm3YjArJ9NLQPTkdk1nah rfNGFjmTkkyYN2tNoAEJjkWYK46NbeUEQzftvqlSgvCzE8qdgWh6jg7kC7KJOluZfmEX MLAIglWeXYCoPrrTFn31G/cL88CIxixiUhjYjnCV6yB6qSjPecDMtVRnpTOet+J9ON51 TGfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZRthp9gk8MduiBj9HJPfpfWTS97IoCeG1QDk4jIY0GY=; b=UlBaOtSqm45p+UIz4PXVsD9aYHhIrc6KBjeawwybf66Fshav7uV/RxpteOfST0GpEV Xd/FCAaX2UhWKDr3KYbLBFIlJtf4u0dm1XMYrgwBbRm4WDjREdlvBn8E+7eBpte83Iyr FQomMijV0e0znmrLTvOLpTDwvYGGJSIhGOm7XXLlDhaaQHuI0epMeeLuoH6AJhbGfnqx CIpLKBHpeqDmb/SuXkWpomkwbDCyrgCxHkCX8Uv68NgOBFpABcH+XbYM87XtGqFq72Ig UiSJo+eozErd65iX/nve+16k7+95M/5SiV+q8oEgsktsXZEQa0xtJwFRN3I3ZkD8EnQD TUQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=hBHEQRQF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x33-20020a634a21000000b005347fcb785bsi2334502pga.204.2023.06.09.03.36.44; Fri, 09 Jun 2023 03:37:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=hBHEQRQF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241821AbjFIJqm (ORCPT + 99 others); Fri, 9 Jun 2023 05:46:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241817AbjFIJqK (ORCPT ); Fri, 9 Jun 2023 05:46:10 -0400 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1E4149F5 for ; Fri, 9 Jun 2023 02:40:49 -0700 (PDT) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id BE7153F37B for ; Fri, 9 Jun 2023 09:32:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1686303170; bh=ZRthp9gk8MduiBj9HJPfpfWTS97IoCeG1QDk4jIY0GY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hBHEQRQFbDSNW2n6O+anq/+lBYJUJBHWHpvjoXe8xn3KveTSF/jvaitBd9+mtE2/F 8DSd/9g9S5VZBw4rNlC+foFUAirG6BYlaaqNaHPI52mjX//vuvZFdvp7jFEujjmkNS arN1N69tjXyzlau0D/EBs71i53qd7Dx/0Ky6mvDJmCTfAz85Qw0A/lCQ2nNs5uJiTv zstVDVq6ffwqOJASHk/nWRR0C7g//qHKAz2E9we/qb7Lf4t/u/0pNeMEhoWNMd5TrG TsifYfNlDuioEwBMkR/pqlEGL5nDlJdwEG+UAHycLSpUkHBAxL7o/eah5eM2GrKZ3z Wxz1TjWkLIs9g== Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9744659b7b5so187387966b.3 for ; Fri, 09 Jun 2023 02:32:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686303169; x=1688895169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZRthp9gk8MduiBj9HJPfpfWTS97IoCeG1QDk4jIY0GY=; b=ErL9xELM+CW0bPr3FUqDTO0sKhumGoiAduRcMRzTYHPv2R1h1JRoKSyYm7qUUY7lpf xGgO3/cPdqEU3wfvOp/klhxmYILMVlt0dEEd0puZYllqD0jweyYXEZtC6gq68BrGBpQa y8EoU16l98+7eFNs4B2tBQKem0ThI+CeNW186BpXJHxjQhsWlcKWaNCpZfQX7pEME0sx AtYiP1/CWkbaTSWFIR44Kr+18EmfQW4MVN1ezt99AAKRp1MMxTuY0GMSj3iPxXD1LuLs REIfLYHjxC4drx/skoCVR7KDNeNi74HIGRyJqGTmM3rMxHBN49KDELsWnKUtbughBd0V PsgA== X-Gm-Message-State: AC+VfDyWd9TNt0Ga+5R3ifC5vFtTnfXAaJUH/hW3aJPkUDLLgh3B8Y75 L+iiV+fI6Q/1B6cLAq2kumyNHMcMGPWCVEyMLzYY68VIbTh9FkHQpZhCGDrid4u+27fN9w4MFBh IM5/ABUzQELS4z5Gm5FaujatzXpnK+fhbARNk8ye4Cg== X-Received: by 2002:a17:907:1c90:b0:974:ae01:3af4 with SMTP id nb16-20020a1709071c9000b00974ae013af4mr1458848ejc.68.1686303169217; Fri, 09 Jun 2023 02:32:49 -0700 (PDT) X-Received: by 2002:a17:907:1c90:b0:974:ae01:3af4 with SMTP id nb16-20020a1709071c9000b00974ae013af4mr1458836ejc.68.1686303169020; Fri, 09 Jun 2023 02:32:49 -0700 (PDT) Received: from amikhalitsyn.local (dslb-002-205-064-187.002.205.pools.vodafone-ip.de. [2.205.64.187]) by smtp.gmail.com with ESMTPSA id e25-20020a170906081900b0094ee3e4c934sm1031248ejd.221.2023.06.09.02.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 02:32:48 -0700 (PDT) From: Alexander Mikhalitsyn To: xiubli@redhat.com Cc: brauner@kernel.org, stgraber@ubuntu.com, linux-fsdevel@vger.kernel.org, Alexander Mikhalitsyn , Jeff Layton , Ilya Dryomov , ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 07/15] ceph: pass idmap to __ceph_setattr Date: Fri, 9 Jun 2023 11:31:18 +0200 Message-Id: <20230609093125.252186-8-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230609093125.252186-1-aleksandr.mikhalitsyn@canonical.com> References: <20230609093125.252186-1-aleksandr.mikhalitsyn@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768221071989641465?= X-GMAIL-MSGID: =?utf-8?q?1768221071989641465?= Just pass down the mount's idmapping to __ceph_setattr, because we will need it later. Cc: Xiubo Li Cc: Jeff Layton Cc: Ilya Dryomov Cc: brauner@kernel.org Cc: ceph-devel@vger.kernel.org Signed-off-by: Alexander Mikhalitsyn --- fs/ceph/acl.c | 4 ++-- fs/ceph/crypto.c | 2 +- fs/ceph/inode.c | 6 ++++-- fs/ceph/super.h | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c index 8a56f979c7cb..f53f7a758c05 100644 --- a/fs/ceph/acl.c +++ b/fs/ceph/acl.c @@ -140,7 +140,7 @@ int ceph_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, newattrs.ia_ctime = current_time(inode); newattrs.ia_mode = new_mode; newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; - ret = __ceph_setattr(inode, &newattrs, NULL); + ret = __ceph_setattr(idmap, inode, &newattrs, NULL); if (ret) goto out_free; } @@ -151,7 +151,7 @@ int ceph_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, newattrs.ia_ctime = old_ctime; newattrs.ia_mode = old_mode; newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; - __ceph_setattr(inode, &newattrs, NULL); + __ceph_setattr(idmap, inode, &newattrs, NULL); } goto out_free; } diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c index e72bab29d5e1..8e298d7bf570 100644 --- a/fs/ceph/crypto.c +++ b/fs/ceph/crypto.c @@ -112,7 +112,7 @@ static int ceph_crypt_set_context(struct inode *inode, const void *ctx, size_t l cia.fscrypt_auth = cfa; - ret = __ceph_setattr(inode, &attr, &cia); + ret = __ceph_setattr(&nop_mnt_idmap, inode, &attr, &cia); if (ret == 0) inode_set_flags(inode, S_ENCRYPTED, S_ENCRYPTED); kfree(cia.fscrypt_auth); diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index f45d9c066523..9a4579da32f8 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -2424,7 +2424,8 @@ static int fill_fscrypt_truncate(struct inode *inode, return ret; } -int __ceph_setattr(struct inode *inode, struct iattr *attr, struct ceph_iattr *cia) +int __ceph_setattr(struct mnt_idmap *idmap, struct inode *inode, + struct iattr *attr, struct ceph_iattr *cia) { struct ceph_inode_info *ci = ceph_inode(inode); unsigned int ia_valid = attr->ia_valid; @@ -2695,6 +2696,7 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr, struct ceph_iattr *c if (mask) { req->r_inode = inode; ihold(inode); + req->r_mnt_idmap = mnt_idmap_get(idmap); req->r_inode_drop = release; req->r_args.setattr.mask = cpu_to_le32(mask); req->r_num_caps = 1; @@ -2766,7 +2768,7 @@ int ceph_setattr(struct mnt_idmap *idmap, struct dentry *dentry, ceph_quota_is_max_bytes_exceeded(inode, attr->ia_size)) return -EDQUOT; - err = __ceph_setattr(inode, attr, NULL); + err = __ceph_setattr(idmap, inode, attr, NULL); if (err >= 0 && (attr->ia_valid & ATTR_MODE)) err = posix_acl_chmod(&nop_mnt_idmap, dentry, attr->ia_mode); diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 107a9d16a4e8..8516ac571da9 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -1095,7 +1095,8 @@ struct ceph_iattr { struct ceph_fscrypt_auth *fscrypt_auth; }; -extern int __ceph_setattr(struct inode *inode, struct iattr *attr, struct ceph_iattr *cia); +extern int __ceph_setattr(struct mnt_idmap *idmap, struct inode *inode, + struct iattr *attr, struct ceph_iattr *cia); extern int ceph_setattr(struct mnt_idmap *idmap, struct dentry *dentry, struct iattr *attr); extern int ceph_getattr(struct mnt_idmap *idmap,