Commit 863f144f authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

vfs: open inside ->tmpfile() 



This is in preparation for adding tmpfile support to fuse, which requires
that the tmpfile creation and opening are done as a single operation.

Replace the 'struct dentry *' argument of i_op->tmpfile with
'struct file *'.

Call finish_open_simple() as the last thing in ->tmpfile() instances (may
be omitted in the error case).

Change d_tmpfile() argument to 'struct file *' as well to make callers more
readable.

Reviewed-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 9751b338

Documentation/filesystems/locking.rst

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ prototypes:: 
	int (*atomic_open)(struct inode *, struct dentry *,

				struct file *, unsigned open_flag,

				umode_t create_mode);

	int (*tmpfile) (struct inode *, struct dentry *, umode_t);

	int (*tmpfile) (struct user_namespace *, struct inode *,

			struct file *, umode_t);

	int (*fileattr_set)(struct user_namespace *mnt_userns,

			    struct dentry *dentry, struct fileattr *fa);

	int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);

Documentation/filesystems/porting.rst

+10 −0
Original line number Diff line number Diff line
@@ -922,3 +922,13 @@ is provided - file_open_root_mnt(). In-tree users adjusted. 
no_llseek is gone; don't set .llseek to that - just leave it NULL instead.

Checks for "does that file have llseek(2), or should it fail with ESPIPE"

should be done by looking at FMODE_LSEEK in file->f_mode.



---



**mandatory**



Calling conventions for ->tmpfile() have changed.  It now takes a struct

file pointer instead of struct dentry pointer.  d_tmpfile() is similarly

changed to simplify callers.  The passed file is in a non-open state and on

success must be opened before returning (e.g. by calling

finish_open_simple()).

Documentation/filesystems/vfs.rst

+4 −2
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ As of kernel 2.6.22, the following members are defined: 
		void (*update_time)(struct inode *, struct timespec *, int);

		int (*atomic_open)(struct inode *, struct dentry *, struct file *,

				   unsigned open_flag, umode_t create_mode);

		int (*tmpfile) (struct user_namespace *, struct inode *, struct dentry *, umode_t);

		int (*tmpfile) (struct user_namespace *, struct inode *, struct file *, umode_t);

	        int (*set_acl)(struct user_namespace *, struct inode *, struct posix_acl *, int);

		int (*fileattr_set)(struct user_namespace *mnt_userns,

				    struct dentry *dentry, struct fileattr *fa);
@@ -589,7 +589,9 @@ otherwise noted. 
``tmpfile``

	called in the end of O_TMPFILE open().  Optional, equivalent to

	atomically creating, opening and unlinking a file in given

	directory.

	directory.  On success needs to return with the file already

	open; this can be done by calling finish_open_simple() right at

	the end.



``fileattr_get``

	called on ioctl(FS_IOC_GETFLAGS) and ioctl(FS_IOC_FSGETXATTR) to

fs/bad_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int bad_inode_atomic_open(struct inode *inode, struct dentry *dentry, 
}



static int bad_inode_tmpfile(struct user_namespace *mnt_userns,

			     struct inode *inode, struct dentry *dentry,

			     struct inode *inode, struct file *file,

			     umode_t mode)

{

	return -EIO;

fs/btrfs/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -10168,7 +10168,7 @@ static int btrfs_permission(struct user_namespace *mnt_userns, 
}



static int btrfs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir,

			 struct dentry *dentry, umode_t mode)

			 struct file *file, umode_t mode)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);

	struct btrfs_trans_handle *trans;
@@ -10176,7 +10176,7 @@ static int btrfs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir, 
	struct inode *inode;

	struct btrfs_new_inode_args new_inode_args = {

		.dir = dir,

		.dentry = dentry,

		.dentry = file->f_path.dentry,

		.orphan = true,

	};

	unsigned int trans_num_items;
@@ -10213,7 +10213,7 @@ static int btrfs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir, 
	set_nlink(inode, 1);



	if (!ret) {

		d_tmpfile(dentry, inode);

		d_tmpfile(file, inode);

		unlock_new_inode(inode);

		mark_inode_dirty(inode);

	}
@@ -10225,7 +10225,7 @@ static int btrfs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir, 
out_inode:

	if (ret)

		iput(inode);

	return ret;

	return finish_open_simple(file, ret);

}



void btrfs_set_range_writeback(struct btrfs_inode *inode, u64 start, u64 end)