From patchwork Wed Jul 19 13:50:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 122637 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2457437vqt; Wed, 19 Jul 2023 06:59:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlF778fOvMNT4O+ATDzUJeZvP7a63tI8JY0ii3itUp1YxC1gBprt94twi5TiQ+mYTGprwLjZ X-Received: by 2002:a17:903:1d1:b0:1bb:3d05:764 with SMTP id e17-20020a17090301d100b001bb3d050764mr2768549plh.32.1689775167278; Wed, 19 Jul 2023 06:59:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689775167; cv=none; d=google.com; s=arc-20160816; b=ZeeiDUVQ0jO7UhsryhEaAFUm0+UWUMyfsmttKl8GgxdZCQjiTIJSRKRxYYrfpcEXWi 1AKLNRNfb4RzBvvI6nersczAi/X1lYN0mGW9nA7tRCPu/DJkcf+VbUb1CjppSmjIdb/J oc3EbYxq0yEa6lZ+iLs2GZ4+HOicLhRF0aphySwJSN+M22sLoGKCTQxD+l29G+GUgm+s GxZx6j2ursSNAdyxXX69eGSVLwZuFOfCOMIJnWFwbll0eWoa4JPqyGqmDB8nEWRpWQBO 4uu2Wx9H8+mnHdt20nFIFBvU/0hJDcqO4XYzx4r/EAPH8CwKghXmNarn3fID25tgOQZP UQfA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=fM797S7MSHVf/ppIVilql+u6327Hw9wj9qKjgqMcrag=; fh=5/tJX5opFV5w1frY3pTlI79vDLVOntPbYwD9w+dLvhs=; b=b1WoM3g4FrMEf+nQBeaZmcw+3mfzlNf7ZDgYuYHQbqDklhVJAXdlzYK/B7JeHNgEz3 oyPo0XVoqti0csHbXI3AghrAKlKEJ3YAQoOaSk7sR75MX2Y+oSnLBhE1wqGnD6VzqFHD YwjtjInwjH4XEzSKGLnC3+wr6QpCTL/1fk5ApIEI1QfglzthLlN4tRwZCYuS9Yu+xkgf 1c/QIDordlJ4jLEO9DRNEAWkJbNwsa0wifNho93SD8zMtZXMvM/bJmL6jNpZaIrsdzf4 AU5kZs4NggWbjfS0lvWIGQ7677++VHARi2O1AE5lC2oEO35NmMGKdd7uhsF4tf3GEAmT dB+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Y2O5BFAo; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u17-20020a170903125100b001b89bab468esi3687735plh.107.2023.07.19.06.59.13; Wed, 19 Jul 2023 06:59:27 -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=@kernel.org header.s=k20201202 header.b=Y2O5BFAo; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231163AbjGSNu4 (ORCPT + 99 others); Wed, 19 Jul 2023 09:50:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjGSNuy (ORCPT ); Wed, 19 Jul 2023 09:50:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE63D19A for ; Wed, 19 Jul 2023 06:50:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2464D6162A for ; Wed, 19 Jul 2023 13:50:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24012C433C8; Wed, 19 Jul 2023 13:50:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689774652; bh=eTOECLHt5+G+o9Vzad3QTBIsWxNKNRHb3k78HAMje+8=; h=From:To:Cc:Subject:Date:From; b=Y2O5BFAoZ2CHTqSqwUJ+RPN9ykaUQawY0y4u8GAS36D4HWhlinDsm4+7QPOKx24q5 bWywxYLgM+Fiz41q9cAkeu1U5vuXrCcRzNHMyhHzOIYVhax2+T6X2hdKhWBC2pULjp HKgjEr8Sk7U7FopdiTWnW25uU3rK6ZgfqF0JAHcTJpXL+jAQvXE1yRkMzb47E7QoBy GLvFDLiBTA6tMoTUTqUy7o/9trJJyc9K8tYBdSvnLg+sfIBUauYuw2HepkDS9pXALW FzC4BGe5kvZ9c5p+vO1vr2DqI3LlKEJ+zBQcOxyhAZxrs/C8NpFoZeaoQ/QvqM/0em d0Ux4ToiuYyAw== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 1/2] f2fs: fix to update i_ctime in __f2fs_setxattr() Date: Wed, 19 Jul 2023 21:50:45 +0800 Message-Id: <20230719135047.2947030-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: INBOX X-GMAIL-THRID: 1771857685510727107 X-GMAIL-MSGID: 1771857685510727107 generic/728 - output mismatch (see /media/fstests/results//generic/728.out.bad) --- tests/generic/728.out 2023-07-19 07:10:48.362711407 +0000 +++ /media/fstests/results//generic/728.out.bad 2023-07-19 08:39:57.000000000 +0000 QA output created by 728 +Expected ctime to change after setxattr. +Expected ctime to change after removexattr. Silence is golden ... (Run 'diff -u /media/fstests/tests/generic/728.out /media/fstests/results//generic/728.out.bad' to see the entire diff) generic/729 1s It needs to update i_ctime after {set,remove}xattr, fix it. Signed-off-by: Chao Yu --- fs/f2fs/xattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c index 476b186b90a6..71bfa2391ab4 100644 --- a/fs/f2fs/xattr.c +++ b/fs/f2fs/xattr.c @@ -757,17 +757,17 @@ static int __f2fs_setxattr(struct inode *inode, int index, if (index == F2FS_XATTR_INDEX_ENCRYPTION && !strcmp(name, F2FS_XATTR_NAME_ENCRYPTION_CONTEXT)) f2fs_set_encrypted_inode(inode); - f2fs_mark_inode_dirty_sync(inode, true); if (!error && S_ISDIR(inode->i_mode)) set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_CP); same: if (is_inode_flag_set(inode, FI_ACL_MODE)) { inode->i_mode = F2FS_I(inode)->i_acl_mode; - inode->i_ctime = current_time(inode); clear_inode_flag(inode, FI_ACL_MODE); } + inode->i_ctime = current_time(inode); + f2fs_mark_inode_dirty_sync(inode, true); exit: kfree(base_addr); return error; From patchwork Wed Jul 19 13:50:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 122640 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2470502vqt; Wed, 19 Jul 2023 07:15:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlGD9STq/gBpoQQAIqqjBL93M8lsrilazkIa40bNDxT4JtxbF/PkqUvMFZPkvkgRn32X0In1 X-Received: by 2002:a17:902:d2d2:b0:1b8:8702:1e7c with SMTP id n18-20020a170902d2d200b001b887021e7cmr3381037plc.33.1689776155617; Wed, 19 Jul 2023 07:15:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689776155; cv=none; d=google.com; s=arc-20160816; b=PEBta5nZ9oTopkNAZshpttyyXLlNWR9BrddFYXPHf9dOvgruRM+ONbdhoWdYj3NCag lymUjQ1nm2iI7cXfDlCTvLpO7FQEqGMM6Wgf5wMEbNr6TTwohj04Tto1n+wyLpumnPAm S3xwUoE5CsLuU1i9AAsX/A3LS6hY42Nky6ruvtHYOvrCjCVC2OnjOo40x8pOKmIa201S wqnn/9SaBPpAvqKtFTaghiJTAYE/9awH2LvJ/Sh7U+rixfQf3zhCJs8qKrqiGkv/W8LQ 9rRyyxcl2mIbZdFo8pgiWDbUroq9YEMDACzKVk/t9M4TPS2dhpujlOg019BBYcVSYI3E +Z6w== 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=ZFez3G9iZwTDX9MwhqfV3uWTzMROT16heX9xDgJmM5w=; fh=5/tJX5opFV5w1frY3pTlI79vDLVOntPbYwD9w+dLvhs=; b=TBIfq1yD/KKAE8uUwl4OynyzqRTBAmZwoamYQb81lY62+c1AdC+EKLkFGvYrGOd7kT lBNGAWvl9FUs9MkD2qkNHVSmFBXkWsRcDg3tqwTTSuEvmyfkIxN/txMstZDBwo26YAvN Gs/f582HkplLkYDRhiefTseBywUjLwdKvnY1npBrp32HyXysj+8N0nJLN74CCohHucGI HbT/+Dk760Vs9x33A2UyGBKRcrejBpnRRWNp/4IncTv73EJEDZXUxsgC9mXR65bn6qRf xsm1hdLcVLIiP+cUrc7UK4NbCILWpsN7ca2K4I1comMC3KdwGKL5+QTJyq3zadNbBqBO Kqsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZYhfHhir; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h125-20020a636c83000000b0055ab9bf1e3csi3540876pgc.738.2023.07.19.07.15.18; Wed, 19 Jul 2023 07:15:55 -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=@kernel.org header.s=k20201202 header.b=ZYhfHhir; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229932AbjGSNu6 (ORCPT + 99 others); Wed, 19 Jul 2023 09:50:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231169AbjGSNu4 (ORCPT ); Wed, 19 Jul 2023 09:50:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F5C51A6 for ; Wed, 19 Jul 2023 06:50:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D1D1A6162A for ; Wed, 19 Jul 2023 13:50:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2E81C433C7; Wed, 19 Jul 2023 13:50:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689774654; bh=jxSEIgFFgOG/2+9mEHtdiwLWFjzU1BfBqEW1cWXN2HU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZYhfHhirwP+IqwIhtU2G4WJc0ZWbF9nXm9soVIzoHF02McjRI5GfC4rG3jm1QGQqK l6ClKF/zYBPX8v4gRfU+iVV5QIgUu8rOxTXTpgGJkCjzBhlm3o0e/2gbPwemooAV/w P/dG6uMokDNnTvmy8FoFRWUZkuT3DeIPRrSsiG+ymqYVzw40smpQpCZq8xA8AQUbJS 1VL5x+GKGDxSnyeeTWU0dg5FhGlyMNw9E5U6FCR3SzNmJ8Uc9MEC2zabXxqcAOUkdN GHYyLWi+3p/v6kcmtDlvg17QZGXqt9VCrKZ6NIrCrulw1pXNOqyjKjFAVsGEgrm3sO zaJI1dpPRHsOA== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 2/2] f2fs: remove unneeded check condition in __f2fs_setxattr() Date: Wed, 19 Jul 2023 21:50:46 +0800 Message-Id: <20230719135047.2947030-2-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230719135047.2947030-1-chao@kernel.org> References: <20230719135047.2947030-1-chao@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: INBOX X-GMAIL-THRID: 1771858722182684292 X-GMAIL-MSGID: 1771858722182684292 It has checked return value of write_all_xattrs(), remove unneeded following check condition. Signed-off-by: Chao Yu --- fs/f2fs/xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c index 71bfa2391ab4..9cc1ca75b2da 100644 --- a/fs/f2fs/xattr.c +++ b/fs/f2fs/xattr.c @@ -757,7 +757,7 @@ static int __f2fs_setxattr(struct inode *inode, int index, if (index == F2FS_XATTR_INDEX_ENCRYPTION && !strcmp(name, F2FS_XATTR_NAME_ENCRYPTION_CONTEXT)) f2fs_set_encrypted_inode(inode); - if (!error && S_ISDIR(inode->i_mode)) + if (S_ISDIR(inode->i_mode)) set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_CP); same: