From: Miklos Szeredi <mszeredi@redhat.com>
Date: Fri, 22 Oct 2021 15:03:02 +0000 (+0200)
Subject: fuse: simplify __fuse_write_file_get()
X-Git-Tag: v6.6.17~8874^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84840efc3c0f225ee5597e0a013e9da03afc73c6;p=platform%2Fkernel%2Flinux-rpi.git

fuse: simplify __fuse_write_file_get()

Use list_first_entry_or_null() instead of list_empty() + list_entry().

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index be13f69..31266ca 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1815,14 +1815,13 @@ static void fuse_writepage_end(struct fuse_mount *fm, struct fuse_args *args,
 
 static struct fuse_file *__fuse_write_file_get(struct fuse_inode *fi)
 {
-	struct fuse_file *ff = NULL;
+	struct fuse_file *ff;
 
 	spin_lock(&fi->lock);
-	if (!list_empty(&fi->write_files)) {
-		ff = list_entry(fi->write_files.next, struct fuse_file,
-				write_entry);
+	ff = list_first_entry_or_null(&fi->write_files, struct fuse_file,
+				      write_entry);
+	if (ff)
 		fuse_file_get(ff);
-	}
 	spin_unlock(&fi->lock);
 
 	return ff;