From patchwork Mon Nov 8 13:50:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 12608441 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 240E3C433F5 for ; Mon, 8 Nov 2021 13:51:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0551361178 for ; Mon, 8 Nov 2021 13:51:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240125AbhKHNxo (ORCPT ); Mon, 8 Nov 2021 08:53:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20044 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240119AbhKHNxh (ORCPT ); Mon, 8 Nov 2021 08:53:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636379453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SkPNVG3Eg+tX4YBhDy3zVIyyWAOTg6mLj2iMt5oNomk=; b=bBJAgjOLdLkZn+p/wFJ4/uDGhic/rNFyHXAr87KqugBDTw994/S+usoqxVRBjd/h613Amm uX7o2xmoy0JE+Jx00iODxg4Hupf5nugcgxhWCCzaNGe1PyUvEzsefk5hu3cJZPU/WJU/q0 wEPnkH1ge7r3Ni94tH8gW61I6pDlbio= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-370-QwX2d9vmPsaQCQqlKuMxRQ-1; Mon, 08 Nov 2021 08:50:49 -0500 X-MC-Unique: QwX2d9vmPsaQCQqlKuMxRQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 558FD875118; Mon, 8 Nov 2021 13:50:48 +0000 (UTC) Received: from lxbceph1.gsslab.pek2.redhat.com (unknown [10.72.47.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 389A179458; Mon, 8 Nov 2021 13:50:45 +0000 (UTC) From: xiubli@redhat.com To: jlayton@kernel.org Cc: idryomov@gmail.com, vshankar@redhat.com, khiremat@redhat.com, ceph-devel@vger.kernel.org, Xiubo Li Subject: [PATCH 2/2] ceph: there is no need to round up the sizes when new size is 0 Date: Mon, 8 Nov 2021 21:50:12 +0800 Message-Id: <20211108135012.79941-3-xiubli@redhat.com> In-Reply-To: <20211108135012.79941-1-xiubli@redhat.com> References: <20211108135012.79941-1-xiubli@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org From: Xiubo Li Signed-off-by: Xiubo Li --- fs/ceph/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index b371f596b97d..1b4ce453d397 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -2560,7 +2560,7 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr, struct ceph_iattr *c mask |= CEPH_SETATTR_SIZE; release |= CEPH_CAP_FILE_SHARED | CEPH_CAP_FILE_EXCL | CEPH_CAP_FILE_RD | CEPH_CAP_FILE_WR; - if (IS_ENCRYPTED(inode)) { + if (IS_ENCRYPTED(inode) && attr->ia_size) { set_bit(CEPH_MDS_R_FSCRYPT_FILE, &req->r_req_flags); mask |= CEPH_SETATTR_FSCRYPT_FILE; req->r_args.setattr.size =