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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A48B2C25B6D for ; Wed, 25 Oct 2023 14:39:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2817D6B031F; Wed, 25 Oct 2023 10:39:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 231A66B0322; Wed, 25 Oct 2023 10:39:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 121056B0323; Wed, 25 Oct 2023 10:39:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 0575C6B031F for ; Wed, 25 Oct 2023 10:39:48 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D996E1A05FD for ; Wed, 25 Oct 2023 14:39:47 +0000 (UTC) X-FDA: 81384242814.27.0487208 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf26.hostedemail.com (Postfix) with ESMTP id 37CFE140018 for ; Wed, 25 Oct 2023 14:39:44 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tJPfWDt5; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698244785; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ggRe7HGvOVR9W37Gx5+ziMK8RcFIntEfKbR4DWkDx0s=; b=Y5VuN8bwMiqfL65hvz7hYykMsh4WSrkORBYtvfe9ZKL7xsosBWVU9vSkldMNfDTiz0zS4c QMyGcHxQ220OLvoxuFYYqYJDsqp3wHr8otiebpLB3/o9x+FUc3ptg2aRjr0RNw0aKu8Q3M h5SQ3qUcIZ0NIUeKLz81Iyi+DOZ3H4U= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tJPfWDt5; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698244785; a=rsa-sha256; cv=none; b=DSBIqBmUs9VZj0ttcBPV/+9vuZTblLLbG0UV8tc59tLisAXKD3TXYVEqoX++zrt4ZvtTUn FggM5a7MIg8Y0X4VIn8UF32tNkM4Sqi67ZyxmUBhs+RZfe73qibSpTf5MgyCT3/dyoWpwg dk2admYI/N2k6JVZ8PfmR9kf7YMfx1c= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0C891630BA; Wed, 25 Oct 2023 14:39:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7FF1C433C8; Wed, 25 Oct 2023 14:39:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698244783; bh=GE2SFdyv9cPI+wHMUMYdDQNMKbpwQ523nL6lEiQznvg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=tJPfWDt5LZA47V0pmiuWNNY47E4t0Gnh2UML/j2/DIfaOGcHADX2EI5MFca7JN8ED NlIuKBDP1WGLPhmCChLc6qeSCTxTfqHqTg5JnmyoitNXt6Gja3fZctIK4/dqwWnXOG IOsFoT9KyJeWCH0bU8LInPxBSllbbVtMIe8lL8Kdk502z1ru73+joKMxZ3APnbKtcF cynXwXatUIU262lfXGHF4dqV68yZoxQ2/T8I+vXyz27PaYligoUnuERoOoJlGvan4x UR6qIEARwgK7IPd88MfZbCknCU63QF652j2+CP0cTfb9466ocde8Pup7buLV3k24N+ PAuE/Z7LNUK0g== Date: Wed, 25 Oct 2023 07:39:43 -0700 From: "Darrick J. Wong" To: Christoph Hellwig Cc: Jens Axboe , Matthew Wilcox , Ilya Dryomov , Andrew Morton , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 3/4] xfs: clean up FS_XFLAG_REALTIME handling in xfs_ioctl_setattr_xflags Message-ID: <20231025143943.GC3195650@frogsfrogsfrogs> References: <20231025141020.192413-1-hch@lst.de> <20231025141020.192413-4-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231025141020.192413-4-hch@lst.de> X-Rspamd-Queue-Id: 37CFE140018 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: x57z65t4u5dw8htcnzbdyfb44ri6kc9o X-HE-Tag: 1698244784-97009 X-HE-Meta: U2FsdGVkX1+A+WM5PrnxdOncf4a0sqn+Vbhk3UN30ZeZoYvkdlD5jJ1Ymbl8mq4FPRhOoNzcKXMV/JancB7XopI4IAj47O6V8tvgHzdf/hHAFILV9vHJR2vW5P21O2/25LGxmjn0Ln+2MCUjD+T+mvAfU4tiNvs2hC4QZGNjE5C/bW0uWKIAOkTnMJ7yakAA/Gf6FBDQFqBYRatEeUmsV94WUDksooRBdkZ2JkpVCTeCkx0Sfg8NEdazC33riCdThNyh6ckZ8SRzcSNJCSF8+OOvzNVJZWPfJuN3z8zG0UfOFRpGLCA5AItmeh/zoLrN+Ev/shRHtGuAP9j11RN+Nx5LRVJcNDqHHycX2FELb060Inl/YIHAZOdfNpIEb6aAHPPQpTe2rFGHsunbVlDMm5nrZcZlb0mtRuoI22IVlPWQSPzYu6BPTo9Kqy0jxA67ln41aGm2IVQB12PGjEU3Qjp5EfZ58PBXCBXV0x8t/K4msUpuUmgbzAQaWqLW0S163PHC1HIW18Zj+8PFb8flT21lVMvzS8G9YICXbFSwWRTxkmieZD646iAvAsY1dAUu8F32atOc/MmCnBlHKJNz16vg8YfljUevzwuOF+ZJ7wJEDL9oJewIbVFAnT3UMnAsRVJ7YmF6k7CQVn9SiHUr2tz0Dsx4g6q860JBUUjyOD2ELH2pJunoxpqOOM8gERN89TBRYnhRdHyZeiL6Fcxr6E994ufFVZVShrz5nPKf8MFrRUmQPTv25n00TiHt+43DAkM9aHD/h41QB5TaLUnJX3BI+KZ4582EU7TlNxHN57sSci10avufarn61xQ9T04T3ckQJK3Bn03a4LkIK4APQGevFlscsSUsIxM1Nnc0T0M64N7mS580FqDByblvnCpBPBVP/mSJXi7Ugx3DTDDpf9RKnHG7zg2NHrm+kNr42jO1ZIcwx4PTf7/Fhs594LZzO6QVunfzfFUnV73cjGh uZFvcHz8 p4I7f8fL7ielG2EkMzNo6YtRaq/6eJOdif9+HYubzFgbJgOFSR5OVZXmUBgTUQId8TwHFXuvaLUneODA5zKUZ8lzB+ct5FVggviQayIocF0ghijbkbIoIZZ9CrIHLvIZY7Wk4aZe5Scf7lyW6sho9E0dFh5kaH8WpUlesLyHJmX4yaWoZSQr2+9iY+YvvuzaX7RkAIk7+Ix3cc9iN0zbjOGuGy7sQL2kB9+6484osFo0SXvm6oushEDoDygfuUxL3Wx5wILAMPYJo2aM4Z/PPuksJBeicIvo30xaL X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Wed, Oct 25, 2023 at 04:10:19PM +0200, Christoph Hellwig wrote: > Introduce a local boolean variable if FS_XFLAG_REALTIME to make the > checks for it more obvious, and de-densify a few of the conditionals > using it to make them more readable while at it. > > Signed-off-by: Christoph Hellwig Looks ok, Reviewed-by: Darrick J. Wong --D > --- > fs/xfs/xfs_ioctl.c | 22 ++++++++++++---------- > 1 file changed, 12 insertions(+), 10 deletions(-) > > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index 55bb01173cde8c..be69e7be713e5c 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -1120,23 +1120,25 @@ xfs_ioctl_setattr_xflags( > struct fileattr *fa) > { > struct xfs_mount *mp = ip->i_mount; > + bool rtflag = (fa->fsx_xflags & FS_XFLAG_REALTIME); > uint64_t i_flags2; > > - /* Can't change realtime flag if any extents are allocated. */ > - if ((ip->i_df.if_nextents || ip->i_delayed_blks) && > - XFS_IS_REALTIME_INODE(ip) != (fa->fsx_xflags & FS_XFLAG_REALTIME)) > - return -EINVAL; > + if (rtflag != XFS_IS_REALTIME_INODE(ip)) { > + /* Can't change realtime flag if any extents are allocated. */ > + if (ip->i_df.if_nextents || ip->i_delayed_blks) > + return -EINVAL; > + } > > - /* If realtime flag is set then must have realtime device */ > - if (fa->fsx_xflags & FS_XFLAG_REALTIME) { > + if (rtflag) { > + /* If realtime flag is set then must have realtime device */ > if (mp->m_sb.sb_rblocks == 0 || mp->m_sb.sb_rextsize == 0 || > (ip->i_extsize % mp->m_sb.sb_rextsize)) > return -EINVAL; > - } > > - /* Clear reflink if we are actually able to set the rt flag. */ > - if ((fa->fsx_xflags & FS_XFLAG_REALTIME) && xfs_is_reflink_inode(ip)) > - ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK; > + /* Clear reflink if we are actually able to set the rt flag. */ > + if (xfs_is_reflink_inode(ip)) > + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK; > + } > > /* diflags2 only valid for v3 inodes. */ > i_flags2 = xfs_flags2diflags2(ip, fa->fsx_xflags); > -- > 2.39.2 >