Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Anand Jain <anand.jain@oracle.com>
To:     linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc:     linux-btrfs@vger.kernel.org, Nikolay Borisov <nborisov@suse.com>,
        David Sterba <dsterba@suse.com>,
        Anand Jain <anand.jain@oracle.com>
Subject: [PATCH 1/7] btrfs: make qgroup_free_reserved_data take btrfs_inode
Date:   Fri, 13 Aug 2021 17:55:24 +0800
Message-Id: <8a1f31bf0f35535bb38d906432d78a7de7fdff2c.1628845854.git.anand.jain@oracle.com>
In-Reply-To: <cover.1628845854.git.anand.jain@oracle.com>
References: <cover.1628845854.git.anand.jain@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (39.109.186.25) by SG2PR03CA0124.apcprd03.prod.outlook.com (2603:1096:4:91::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.9 via Frontend Transport; Fri, 13 Aug 2021 09:55:48 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: f5b155ce-b1c2-4725-882c-08d95e4087c4
X-MS-TrafficTypeDiagnostic: BLAPR10MB4852:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BLAPR10MB48524DD5EF6BCE4118B8EF87E5FA9@BLAPR10MB4852.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:418;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: zO4pKcqPCChEkQhDAoLL4mpLgz5moTGbSHvODPZgkflOmcV6HyOYAYjv49XEX1Q+8eQKfphsgsU2qIWrzgj/NPlgtwROX5bI5HPTzkLVzMma9Fu1KLZb53cYT+2rAOFNPDVCwk3B77uxClnsHXempivfl25i1MxDyEXVQAlcYNN/ljngQzo6emmdcklabydbjmwR1C3b9bJe3j/+MxhQ1sNxyfXtjigWaQHmAplKDVmF9BkyIF9oBI9rk/LG26cSQn9+mf8qq4H6+MRuM2SZ5TeT4GqGL30VxaTXxu5IRWC/fNrV8oCDEVW6JLh31a2EVm15eSSN3qhwa7cH6z4fxfYY/fMMieeyLNEVlTeRDvFNKODZlsLmEYeR9F3yKL+kvwSBVrmJJnCtCs8G4tVr6XujDsIfAXBFcS5wmxN/IL8PQ994xE6OjfgGRtqmMUW5qYOFojcb36EAbCsgByNoWG0PCVfd3r65BuAKEHBY2SSQKpifUz5o/FlSCPwX6yim0V6TshrU5omVF4uJm8AWoUfzZwi5IMxyl+/8gxB8oL82jDq/BZmk4hZDHLgiXfarzcof8T7cCjSd2r/gh9Qp9Hao0KnvYQ3o1YCQWH+rx9OfxAB1CaZH4JfRuZICOirCwv0lbI9IuvniFxjzgsJpqnq1YpBb3Bx9P4PIGi3zcXbGmLtKXyzC/ihsLejjIXDJm68Bqo1IS6mz+eZ0oinREA==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB4128.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(136003)(396003)(39860400002)(366004)(376002)(346002)(107886003)(8936002)(8676002)(2906002)(478600001)(316002)(83380400001)(54906003)(44832011)(4326008)(956004)(2616005)(86362001)(186003)(66946007)(26005)(66476007)(6666004)(6486002)(6512007)(52116002)(66556008)(36756003)(5660300002)(38350700002)(38100700002)(6506007);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sBkn7r1KfOilaekiYNB/TtQprfl/phrNRcXBCEToK2UYEq/wqvO1IitDlcRJ?=
 =?us-ascii?Q?RjX5Kau7MxVO60dlpFc06iCNAQdJqvMpN8vsqBaCay1vbJrUPdhW/hiPS60p?=
 =?us-ascii?Q?Wg8q5BMR3gmUVlXZTFjf1xx6OQVv2RLO657PSX0cuOJ7UjAcRdzSojZs+EGc?=
 =?us-ascii?Q?dnS0A9yZDFfcFj9WF0HzkQ1XRQehLEaKV9TDAcUfpkJSuwaynGmMqfUYkCKa?=
 =?us-ascii?Q?rT4FrMCMIn2be8uTbK6Bwdtlt6iy4rWXULCAqfXEe1H1UTGBapGDZ2qnhi3h?=
 =?us-ascii?Q?3Mb85S2U1jLUfqXyVYXck/vzEi55fklNERev5jWmKtamX4zdsJxT4g0IrEsG?=
 =?us-ascii?Q?LXMRuK6p2KlE+lRLsFmHzdIz2cFmaj9gAAf1tRIwhWEL7kJddFI8FbJh7W6o?=
 =?us-ascii?Q?JTG1u20BgbAaBUw7DV7oda3SYBh653XeFJ86C0IMPuKyzK9fCW6QWQbCaESO?=
 =?us-ascii?Q?vMQc3mpPKUg37Pi5/cdx+N5HXaqpiug+cJ84lMP/2sP3WXMbFOmmgVaJ5AZQ?=
 =?us-ascii?Q?yW2g2bV065Y6w0AbG6n9DFO568fAKXeu5TlBRBhiF36xWhXE9M0r0bJl+yvO?=
 =?us-ascii?Q?E07Wdq02GjOmttlrX3dAH2yEk813QVbkbLq4cATsZzrW/+WkCkKAMbCW/ahR?=
 =?us-ascii?Q?Pislt4HJHb/s4U3hZDk33xCcAJ43V2YxRep5X/eaCiLMwjLgh0opa9zQjEYb?=
 =?us-ascii?Q?CJMWyesUf8C0S2uvXCP57Y11t66UUlLzm3ME7/DrjrKd0G8oWmecQX55yrJc?=
 =?us-ascii?Q?nakR+93E4hHCbNPZEfjuHZ9w+spE/eyGenZQ9Jc3xViZKpSeBcjf9k+oseOY?=
 =?us-ascii?Q?esU8aN+eFs1uh5wVTbIxEs2psM1NTSEQDsrw4GG3vyC3krP+RZ6AgndQ41uQ?=
 =?us-ascii?Q?plUwLowFhfVmU2ODrzWRav4CRIBATQim8BvMavERK7PvHz+aMNUcqBG/BeMg?=
 =?us-ascii?Q?6YTUGO01xYPRwyaT//GKlVi8mwGmH5Yrob+FmJUdex0CjbFWY7fkYKi+5+N1?=
 =?us-ascii?Q?C4O/82YG8ANNRSJxcC/gbiJAi0ZkeMY0uLjPaEAFlT725wdNG+C2cLEmie4L?=
 =?us-ascii?Q?6NwBzs3qocuiuczjt0wYhtK/s3RtGW4IuXyRuvNMfI3IWfvkG3fBjF/GebSE?=
 =?us-ascii?Q?mIjMbD5fMMCTWmL3JjIi/PCWEuR7SOYMjhzczbR0yMVlvJQ7ed+FFZ4frSzd?=
 =?us-ascii?Q?MIUxbhv29lpQ2ISvEEbNst9mVEyAfHaWKjsojfAKzN6LVaP3f5frLmVS5Qz4?=
 =?us-ascii?Q?ysycxSDlY/6sEjOEsyRng24+7lZONwqy7owTlV7hEmxkg3lJgvvrdNfMRSG3?=
 =?us-ascii?Q?gCkn9KzOEA50PpzOWVnAJdI6?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f5b155ce-b1c2-4725-882c-08d95e4087c4
X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 09:55:50.1613
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /Db3Whh5lHCFGhLkhndtG0udbpKZrt7WUcrov1JUx4y4ctLRtCMvgT+OG2OaUQVAj3C2RHajugwVE/5YGueFTA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4852
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10074 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999
 malwarescore=0 adultscore=0 spamscore=0 bulkscore=0 mlxscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2107140000 definitions=main-2108130059
X-Proofpoint-ORIG-GUID: PblvL4UyEoePfi0rc9q1-czKmSIhvHz_
X-Proofpoint-GUID: PblvL4UyEoePfi0rc9q1-czKmSIhvHz_
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Nikolay Borisov <nborisov@suse.com>

commit df2cfd131fd33dbef1ce33be8b332b1f3d645f35 upstream

It only uses btrfs_inode so can just as easily take it as an argument.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 fs/btrfs/qgroup.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index cd8e81c02f63..1f214f80d664 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -3481,10 +3481,10 @@ int btrfs_qgroup_reserve_data(struct inode *inode,
 }
 
 /* Free ranges specified by @reserved, normally in error path */
-static int qgroup_free_reserved_data(struct inode *inode,
+static int qgroup_free_reserved_data(struct btrfs_inode *inode,
 			struct extent_changeset *reserved, u64 start, u64 len)
 {
-	struct btrfs_root *root = BTRFS_I(inode)->root;
+	struct btrfs_root *root = inode->root;
 	struct ulist_node *unode;
 	struct ulist_iterator uiter;
 	struct extent_changeset changeset;
@@ -3520,8 +3520,8 @@ static int qgroup_free_reserved_data(struct inode *inode,
 		 * EXTENT_QGROUP_RESERVED, we won't double free.
 		 * So not need to rush.
 		 */
-		ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree,
-				free_start, free_start + free_len - 1,
+		ret = clear_record_extent_bits(&inode->io_tree, free_start,
+				free_start + free_len - 1,
 				EXTENT_QGROUP_RESERVED, &changeset);
 		if (ret < 0)
 			goto out;
@@ -3550,7 +3550,8 @@ static int __btrfs_qgroup_release_data(struct inode *inode,
 	/* In release case, we shouldn't have @reserved */
 	WARN_ON(!free && reserved);
 	if (free && reserved)
-		return qgroup_free_reserved_data(inode, reserved, start, len);
+		return qgroup_free_reserved_data(BTRFS_I(inode), reserved,
+						 start, len);
 	extent_changeset_init(&changeset);
 	ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, start, 
 			start + len -1, EXTENT_QGROUP_RESERVED, &changeset);
-- 
2.31.1