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 X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47133C3F2D2 for ; Fri, 6 Mar 2020 01:39:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 21C4620848 for ; Fri, 6 Mar 2020 01:39:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726498AbgCFBjI (ORCPT ); Thu, 5 Mar 2020 20:39:08 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:11158 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726162AbgCFBjH (ORCPT ); Thu, 5 Mar 2020 20:39:07 -0500 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 0297F88034623412B26A; Fri, 6 Mar 2020 09:39:06 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 6 Mar 2020 09:39:04 +0800 Subject: Re: [f2fs-dev] [PATCH] f2fs: fix wrong check on F2FS_IOC_FSSETXATTR To: Jaegeuk Kim , , CC: Daniel Rosenberg References: <20200305234822.178708-1-jaegeuk@kernel.org> From: Chao Yu Message-ID: <1e8389fb-2416-d191-cdb3-cd4714ed7756@huawei.com> Date: Fri, 6 Mar 2020 09:39:03 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200305234822.178708-1-jaegeuk@kernel.org> Content-Type: text/plain; charset="windows-1252" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020/3/6 7:48, Jaegeuk Kim wrote: > This fixes the incorrect failure when enabling project quota on casefold-enabled > file. > > Cc: Daniel Rosenberg > Signed-off-by: Jaegeuk Kim > --- > fs/f2fs/file.c | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index fb070816a8a5..8a41afac0346 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -1789,12 +1789,15 @@ static int f2fs_file_flush(struct file *file, fl_owner_t id) > static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) > { > struct f2fs_inode_info *fi = F2FS_I(inode); > + u32 masked_flags = fi->i_flags & mask; > + > + f2fs_bug_on(F2FS_I_SB(inode), (iflags & ~mask)); > > /* Is it quota file? Do not allow user to mess with it */ > if (IS_NOQUOTA(inode)) > return -EPERM; > > - if ((iflags ^ fi->i_flags) & F2FS_CASEFOLD_FL) { > + if ((iflags ^ masked_flags) & F2FS_CASEFOLD_FL) { > if (!f2fs_sb_has_casefold(F2FS_I_SB(inode))) > return -EOPNOTSUPP; > if (!f2fs_empty_dir(inode)) > @@ -1808,9 +1811,9 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) > return -EINVAL; > } > > - if ((iflags ^ fi->i_flags) & F2FS_COMPR_FL) { > + if ((iflags ^ masked_flags) & F2FS_COMPR_FL) { > if (S_ISREG(inode->i_mode) && > - (fi->i_flags & F2FS_COMPR_FL || i_size_read(inode) || > + (masked_flags & F2FS_COMPR_FL || i_size_read(inode) || > F2FS_HAS_BLOCKS(inode))) > return -EINVAL; > if (iflags & F2FS_NOCOMP_FL) > @@ -1827,16 +1830,16 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) > set_compress_context(inode); > } > } > - if ((iflags ^ fi->i_flags) & F2FS_NOCOMP_FL) { > - if (fi->i_flags & F2FS_COMPR_FL) > + if ((iflags ^ masked_flags) & F2FS_NOCOMP_FL) { > + if (masked_flags & F2FS_COMPR_FL) > return -EINVAL; > } > > fi->i_flags = iflags | (fi->i_flags & ~mask); > - f2fs_bug_on(F2FS_I_SB(inode), (fi->i_flags & F2FS_COMPR_FL) && > - (fi->i_flags & F2FS_NOCOMP_FL)); > + f2fs_bug_on(F2FS_I_SB(inode), (masked_flags & F2FS_COMPR_FL) && > + (masked_flags & F2FS_NOCOMP_FL)); We don't need to change here due to we should check final status in fi->i_flags rather than checking previous status in masked_flags? > > - if (fi->i_flags & F2FS_PROJINHERIT_FL) > + if (masked_flags & F2FS_PROJINHERIT_FL) Ditto. Thanks, > set_inode_flag(inode, FI_PROJ_INHERIT); > else > clear_inode_flag(inode, FI_PROJ_INHERIT); > 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 X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3BA8C3F2D2 for ; Fri, 6 Mar 2020 01:59:41 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C29820726; Fri, 6 Mar 2020 01:59:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="e+B5JVix"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="HgtqJhRE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C29820726 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jA2H3-0002TO-O1; Fri, 06 Mar 2020 01:59:37 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jA2H0-0002St-Cf for linux-f2fs-devel@lists.sourceforge.net; Fri, 06 Mar 2020 01:59:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:CC:To:Subject:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=enWO7ZdqKDunipiE6KYyxoMigaSFs51tIz5SiYrvzdU=; b=e+B5JVixvYU2gu4rxipExz38Dg 7AyMKZAlSGlYWEX7UGlqaQkNj7QWS9VkLv9QBUoN1lIvedKe47PAnGE/tkzuvB/YX37bDv/dzs9LX CTrkjHlxsuO2Ls6eIRTpnd5JRsrlOlzv5YzTvwvRoQWM91fOmGAvVSN9txnL4J+HX0Wk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:CC:To:Subject:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=enWO7ZdqKDunipiE6KYyxoMigaSFs51tIz5SiYrvzdU=; b=HgtqJhRER6zdSdIjUGP7jXYa69 Wqy+TXQP3gHl9hy4omCtNWwdIowT2xmmVhPDQBKPfCTvo1/lYqUixkFwkRZxFmLN+aIPYj2N6306l QYk5Bthkqw9SmOmkQxeofVutgPkUxfDDeDL28GjsMErtPQxXzU6Xdy06a1/0+NB+uVLg=; Received: from szxga04-in.huawei.com ([45.249.212.190] helo=huawei.com) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jA2Gw-00HWd8-9k for linux-f2fs-devel@lists.sourceforge.net; Fri, 06 Mar 2020 01:59:34 +0000 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 0297F88034623412B26A; Fri, 6 Mar 2020 09:39:06 +0800 (CST) Received: from [10.134.22.195] (10.134.22.195) by smtp.huawei.com (10.3.19.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 6 Mar 2020 09:39:04 +0800 To: Jaegeuk Kim , , References: <20200305234822.178708-1-jaegeuk@kernel.org> From: Chao Yu Message-ID: <1e8389fb-2416-d191-cdb3-cd4714ed7756@huawei.com> Date: Fri, 6 Mar 2020 09:39:03 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200305234822.178708-1-jaegeuk@kernel.org> Content-Language: en-US X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Headers-End: 1jA2Gw-00HWd8-9k Subject: Re: [f2fs-dev] [PATCH] f2fs: fix wrong check on F2FS_IOC_FSSETXATTR X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Rosenberg Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2020/3/6 7:48, Jaegeuk Kim wrote: > This fixes the incorrect failure when enabling project quota on casefold-enabled > file. > > Cc: Daniel Rosenberg > Signed-off-by: Jaegeuk Kim > --- > fs/f2fs/file.c | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index fb070816a8a5..8a41afac0346 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -1789,12 +1789,15 @@ static int f2fs_file_flush(struct file *file, fl_owner_t id) > static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) > { > struct f2fs_inode_info *fi = F2FS_I(inode); > + u32 masked_flags = fi->i_flags & mask; > + > + f2fs_bug_on(F2FS_I_SB(inode), (iflags & ~mask)); > > /* Is it quota file? Do not allow user to mess with it */ > if (IS_NOQUOTA(inode)) > return -EPERM; > > - if ((iflags ^ fi->i_flags) & F2FS_CASEFOLD_FL) { > + if ((iflags ^ masked_flags) & F2FS_CASEFOLD_FL) { > if (!f2fs_sb_has_casefold(F2FS_I_SB(inode))) > return -EOPNOTSUPP; > if (!f2fs_empty_dir(inode)) > @@ -1808,9 +1811,9 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) > return -EINVAL; > } > > - if ((iflags ^ fi->i_flags) & F2FS_COMPR_FL) { > + if ((iflags ^ masked_flags) & F2FS_COMPR_FL) { > if (S_ISREG(inode->i_mode) && > - (fi->i_flags & F2FS_COMPR_FL || i_size_read(inode) || > + (masked_flags & F2FS_COMPR_FL || i_size_read(inode) || > F2FS_HAS_BLOCKS(inode))) > return -EINVAL; > if (iflags & F2FS_NOCOMP_FL) > @@ -1827,16 +1830,16 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) > set_compress_context(inode); > } > } > - if ((iflags ^ fi->i_flags) & F2FS_NOCOMP_FL) { > - if (fi->i_flags & F2FS_COMPR_FL) > + if ((iflags ^ masked_flags) & F2FS_NOCOMP_FL) { > + if (masked_flags & F2FS_COMPR_FL) > return -EINVAL; > } > > fi->i_flags = iflags | (fi->i_flags & ~mask); > - f2fs_bug_on(F2FS_I_SB(inode), (fi->i_flags & F2FS_COMPR_FL) && > - (fi->i_flags & F2FS_NOCOMP_FL)); > + f2fs_bug_on(F2FS_I_SB(inode), (masked_flags & F2FS_COMPR_FL) && > + (masked_flags & F2FS_NOCOMP_FL)); We don't need to change here due to we should check final status in fi->i_flags rather than checking previous status in masked_flags? > > - if (fi->i_flags & F2FS_PROJINHERIT_FL) > + if (masked_flags & F2FS_PROJINHERIT_FL) Ditto. Thanks, > set_inode_flag(inode, FI_PROJ_INHERIT); > else > clear_inode_flag(inode, FI_PROJ_INHERIT); > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel