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;
Message-ID: <0effd60f4f6add28b837aa75e62a5f6e0fe30f88.camel@kernel.org>
Subject: Re: [PATCH] ceph: fix compilation error when building kernel
 without FS_ENCRYPT
From:   Jeff Layton <jlayton@kernel.org>
To:     =?ISO-8859-1?Q?Lu=EDs?= Henriques <lhenriques@suse.de>,
        Xiubo Li <xiubli@redhat.com>, Ilya Dryomov <idryomov@gmail.com>
Cc:     ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org,
        kernel test robot <lkp@intel.com>
Date:   Tue, 19 Apr 2022 06:24:18 -0400
In-Reply-To: <20220419084937.3199-1-lhenriques@suse.de>
References: <20220419084937.3199-1-lhenriques@suse.de>
Content-Type: text/plain; charset="ISO-8859-15"
User-Agent: Evolution 3.42.4 (3.42.4-2.fc35) 
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

On Tue, 2022-04-19 at 09:49 +0100, Lu?s Henriques wrote:
> When compiling without FS_ENCRYPTION config, the kernel will fail to build
> with:
> 
> fs/ceph/inode.c:196:7: error: no member named 'fscrypt_auth' in 'struct ceph_inode_info'
> 
> Enclose the code within an #ifdef CONFIG_FS_ENCRYPTION to fix it.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Lu?s Henriques <lhenriques@suse.de>
> ---
>  fs/ceph/inode.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> Jeff, feel free to squash this patch into one of the previous patches from
> the snapshot names encryption series.
> 
> diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
> index 636e4e0a9dc6..5de7bb9048b7 100644
> --- a/fs/ceph/inode.c
> +++ b/fs/ceph/inode.c
> @@ -189,6 +189,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)
>  	ci->i_rbytes = 0;
>  	ci->i_btime = ceph_inode(parent)->i_btime;
>  
> +#ifdef CONFIG_FS_ENCRYPTION
>  	/* if encrypted, just borrow fscrypt_auth from parent */
>  	if (IS_ENCRYPTED(parent)) {
>  		struct ceph_inode_info *pci = ceph_inode(parent);
> @@ -205,6 +206,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)
>  			goto err;
>  		}
>  	}
> +#endif
>  	if (inode->i_state & I_NEW) {
>  		inode->i_op = &ceph_snapdir_iops;
>  		inode->i_fop = &ceph_snapdir_fops;

Thanks, I folded this one into this patch:

    ceph: add support for encrypted snapshot names

Cheers,
-- 
Jeff Layton <jlayton@kernel.org>