[v3,6/9] fuse: break up fuse_open_common()

Commit Message

Amir Goldstein Feb. 8, 2024, 5:06 p.m. UTC

fuse_open_common() has a lot of code relevant only for regular files and
O_TRUNC in particular.

Copy the little bit of remaining code into fuse_dir_open() and stop using
this common helper for directory open.

Also split out fuse_dir_finish_open() from fuse_finish_open() before we
add inode io modes to fuse_finish_open().

Suggested-by: Miklos Szeredi <[e-mail]>
Signed-off-by: Amir Goldstein <[e-mail]>
---
 fs/fuse/dir.c    | 26 +++++++++++++++++++++++++-
 fs/fuse/file.c   |  9 ++-------
 fs/fuse/fuse_i.h |  2 --
 3 files changed, 27 insertions(+), 10 deletions(-)

Comments

Miklos Szeredi Feb. 9, 2024, 9:59 a.m. UTC | #1

On Thu, 8 Feb 2024 at 18:09, Amir Goldstein <[e-mail]> wrote:

> --- a/fs/fuse/fuse_i.h
> +++ b/fs/fuse/fuse_i.h
> @@ -1034,8 +1034,6 @@ void fuse_read_args_fill(struct fuse_io_args *ia, struct file *file, loff_t pos,
>  /**
>   * Send OPEN or OPENDIR request
>   */
> -int fuse_open_common(struct inode *inode, struct file *file, bool isdir);
> -

Comment above declaration needs to be removed as well.

Thanks,
Miklos

Patch

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index b8fc3a6b87fe..ff324be72abd 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1628,9 +1628,33 @@  static const char *fuse_get_link(struct dentry *dentry, struct inode *inode,
 	return ERR_PTR(err);
 }
 
+static void fuse_dir_finish_open(struct inode *inode, struct file *file)
+{
+	struct fuse_file *ff = file->private_data;
+
+	if (ff->open_flags & FOPEN_STREAM)
+		stream_open(inode, file);
+	else if (ff->open_flags & FOPEN_NONSEEKABLE)
+		nonseekable_open(inode, file);
+}
+
 static int fuse_dir_open(struct inode *inode, struct file *file)
 {
-	return fuse_open_common(inode, file, true);
+	struct fuse_mount *fm = get_fuse_mount(inode);
+	int err;
+
+	if (fuse_is_bad(inode))
+		return -EIO;
+
+	err = generic_file_open(inode, file);
+	if (err)
+		return err;
+
+	err = fuse_do_open(fm, get_node_id(inode), file, true);
+	if (!err)
+		fuse_dir_finish_open(inode, file);
+
+	return err;
 }
 
 static int fuse_dir_release(struct inode *inode, struct file *file)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 0ca471c5d184..84b35bbf22ac 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -227,7 +227,7 @@  static void fuse_truncate_update_attr(struct inode *inode, struct file *file)
 	fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);
 }
 
-int fuse_open_common(struct inode *inode, struct file *file, bool isdir)
+static int fuse_open(struct inode *inode, struct file *file)
 {
 	struct fuse_mount *fm = get_fuse_mount(inode);
 	struct fuse_conn *fc = fm->fc;
@@ -256,7 +256,7 @@  int fuse_open_common(struct inode *inode, struct file *file, bool isdir)
 	if (is_wb_truncate || dax_truncate)
 		fuse_set_nowrite(inode);
 
-	err = fuse_do_open(fm, get_node_id(inode), file, isdir);
+	err = fuse_do_open(fm, get_node_id(inode), file, false);
 	if (!err) {
 		fuse_finish_open(inode, file);
 		if (is_truncate)
@@ -354,11 +354,6 @@  void fuse_release_common(struct file *file, bool isdir)
 			  (fl_owner_t) file, isdir);
 }
 
-static int fuse_open(struct inode *inode, struct file *file)
-{
-	return fuse_open_common(inode, file, false);
-}
-
 static int fuse_release(struct inode *inode, struct file *file)
 {
 	struct fuse_conn *fc = get_fuse_conn(inode);
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index daf7036cd692..5fe096820e97 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -1034,8 +1034,6 @@  void fuse_read_args_fill(struct fuse_io_args *ia, struct file *file, loff_t pos,
 /**
  * Send OPEN or OPENDIR request
  */
-int fuse_open_common(struct inode *inode, struct file *file, bool isdir);
-
 struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release);
 void fuse_file_free(struct fuse_file *ff);
 void fuse_finish_open(struct inode *inode, struct file *file);