Commit f721d24e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pull-tmpfile' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs tmpfile updates from Al Viro:
 "Miklos' ->tmpfile() signature change; pass an unopened struct file to
  it, let it open the damn thing. Allows to add tmpfile support to FUSE"

* tag 'pull-tmpfile' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fuse: implement ->tmpfile()
  vfs: open inside ->tmpfile()
  vfs: move open right after ->tmpfile()
  vfs: make vfs_tmpfile() static
  ovl: use vfs_tmpfile_open() helper
  cachefiles: use vfs_tmpfile_open() helper
  cachefiles: only pass inode to *mark_inode_inuse() helpers
  cachefiles: tmpfile error handling cleanup
  hugetlbfs: cleanup mknod and tmpfile
  vfs: add vfs_tmpfile_open() helper
parents 27bc50fc 7d375390

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
@@ -933,3 +933,13 @@ to) and true - "keep going" (as 0 in old calling conventions). Rationale: 
callers never looked at specific -E... values anyway.  ->iterate() and

->iterate_shared() instance require no changes at all, all filldir_t ones in

the tree converted.



---



**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
@@ -442,7 +442,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);
@@ -592,7 +592,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
@@ -10018,7 +10018,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;
@@ -10026,7 +10026,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;
@@ -10063,7 +10063,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);

	}
@@ -10075,7 +10075,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)