diff mbox series

ceph: remove unless check for the folio

Message ID 20220705024023.301574-1-xiubli@redhat.com
State New
Headers show
Series ceph: remove unless check for the folio | expand

Commit Message

Xiubo Li July 5, 2022, 2:40 a.m. UTC 
From: Xiubo Li <xiubli@redhat.com>

The netfs_write_begin() won't set the folio if the return value
is non-zero.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
---
 fs/ceph/addr.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index e44a3eefb344..8095fc47230e 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -1318,16 +1318,13 @@  static int ceph_write_begin(struct file *file, struct address_space *mapping,
 	int r;
 
 	r = netfs_write_begin(&ci->netfs, file, inode->i_mapping, pos, len, &folio, NULL);
-	if (r == 0)
-		folio_wait_fscache(folio);
-	if (r < 0) {
-		if (folio)
-			folio_put(folio);
-	} else {
-		WARN_ON_ONCE(!folio_test_locked(folio));
-		*pagep = &folio->page;
-	}
-	return r;
+	if (r < 0)
+		return r;
+
+	folio_wait_fscache(folio);
+	WARN_ON_ONCE(!folio_test_locked(folio));
+	*pagep = &folio->page;
+	return 0;
 }
 
 /*