get rid of 'opened' argument of ->atomic_open() - part 3

Al Viro · Al Viro · commit 44907d790024 · 2018-07-12T10:04:20.000-04:00
now it can be done...

Acked-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
@@ -859,8 +859,7 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
 
 static int
 v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
-		     struct file *file, unsigned flags, umode_t mode,
-		     int *opened)
+		     struct file *file, unsigned flags, umode_t mode)
 {
 	int err;
 	u32 perm;
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
@@ -241,8 +241,7 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
 
 static int
 v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
-			  struct file *file, unsigned flags, umode_t omode,
-			  int *opened)
+			  struct file *file, unsigned flags, umode_t omode)
 {
 	int err = 0;
 	kgid_t gid;
diff --git a/fs/bad_inode.c b/fs/bad_inode.c
@@ -134,7 +134,7 @@ static int bad_inode_update_time(struct inode *inode, struct timespec64 *time,
 
 static int bad_inode_atomic_open(struct inode *inode, struct dentry *dentry,
 				 struct file *file, unsigned int open_flag,
-				 umode_t create_mode, int *opened)
+				 umode_t create_mode)
 {
 	return -EIO;
 }
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
@@ -429,8 +429,7 @@ int ceph_open(struct inode *inode, struct file *file)
  * file or symlink, return 1 so the VFS can retry.
  */
 int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
-		     struct file *file, unsigned flags, umode_t mode,
-		     int *opened)
+		     struct file *file, unsigned flags, umode_t mode)
 {
 	struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
 	struct ceph_mds_client *mdsc = fsc->mdsc;
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
@@ -1025,8 +1025,7 @@ extern const struct file_operations ceph_file_fops;
 extern int ceph_renew_caps(struct inode *inode);
 extern int ceph_open(struct inode *inode, struct file *file);
 extern int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
-			    struct file *file, unsigned flags, umode_t mode,
-			    int *opened);
+			    struct file *file, unsigned flags, umode_t mode);
 extern int ceph_release(struct inode *inode, struct file *filp);
 extern void ceph_fill_inline_data(struct inode *inode, struct page *locked_page,
 				  char *data, size_t len);
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
@@ -65,8 +65,7 @@ extern struct inode *cifs_root_iget(struct super_block *);
 extern int cifs_create(struct inode *, struct dentry *, umode_t,
 		       bool excl);
 extern int cifs_atomic_open(struct inode *, struct dentry *,
-			    struct file *, unsigned, umode_t,
-			    int *);
+			    struct file *, unsigned, umode_t);
 extern struct dentry *cifs_lookup(struct inode *, struct dentry *,
 				  unsigned int);
 extern int cifs_unlink(struct inode *dir, struct dentry *dentry);
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
@@ -465,8 +465,7 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid,
 
 int
 cifs_atomic_open(struct inode *inode, struct dentry *direntry,
-		 struct file *file, unsigned oflags, umode_t mode,
-		 int *opened)
+		 struct file *file, unsigned oflags, umode_t mode)
 {
 	int rc;
 	unsigned int xid;
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
@@ -489,7 +489,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
 static int fuse_mknod(struct inode *, struct dentry *, umode_t, dev_t);
 static int fuse_atomic_open(struct inode *dir, struct dentry *entry,
 			    struct file *file, unsigned flags,
-			    umode_t mode, int *opened)
+			    umode_t mode)
 {
 	int err;
 	struct fuse_conn *fc = get_fuse_conn(dir);
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
@@ -1228,14 +1228,13 @@ static int gfs2_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
  * @file: The proposed new struct file
  * @flags: open flags
  * @mode: File mode
- * @opened: Flag to say whether the file has been opened or not
  *
  * Returns: error code or 0 for success
  */
 
 static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry,
 			    struct file *file, unsigned flags,
-			    umode_t mode, int *opened)
+			    umode_t mode)
 {
 	struct dentry *d;
 	bool excl = !!(flags & O_EXCL);
diff --git a/fs/namei.c b/fs/namei.c
@@ -3052,8 +3052,7 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
 	file->f_path.dentry = DENTRY_NOT_SET;
 	file->f_path.mnt = nd->path.mnt;
 	error = dir->i_op->atomic_open(dir, dentry, file,
-				       open_to_namei_flags(open_flag),
-				       mode, opened);
+				       open_to_namei_flags(open_flag), mode);
 	d_lookup_done(dentry);
 	if (!error) {
 		/*
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
@@ -1451,7 +1451,7 @@ static int nfs_finish_open(struct nfs_open_context *ctx,
 
 int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
 		    struct file *file, unsigned open_flags,
-		    umode_t mode, int *opened)
+		    umode_t mode)
 {
 	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
 	struct nfs_open_context *ctx;
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
@@ -258,7 +258,7 @@ extern const struct dentry_operations nfs4_dentry_operations;
 
 /* dir.c */
 int nfs_atomic_open(struct inode *, struct dentry *, struct file *,
-		    unsigned, umode_t, int *);
+		    unsigned, umode_t);
 
 /* super.c */
 extern struct file_system_type nfs4_fs_type;
diff --git a/include/linux/fs.h b/include/linux/fs.h
@@ -1781,7 +1781,7 @@ struct inode_operations {
 	int (*update_time)(struct inode *, struct timespec64 *, int);
 	int (*atomic_open)(struct inode *, struct dentry *,
 			   struct file *, unsigned open_flag,
-			   umode_t create_mode, int *opened);
+			   umode_t create_mode);
 	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
 	int (*set_acl)(struct inode *, struct posix_acl *, int);
 } ____cacheline_aligned;

Original file line number	Diff line number	Diff line change
`@@ -859,8 +859,7 @@ struct dentry v9fs_vfs_lookup(struct inode dir, struct dentry *dentry,`
`859`	`859`
`860`	`860`	`static int`
`861`	`861`	`v9fs_vfs_atomic_open(struct inode dir, struct dentry dentry,`
`862`		`- struct file *file, unsigned flags, umode_t mode,`
`863`		`- int *opened)`
	`862`	`+ struct file *file, unsigned flags, umode_t mode)`
`864`	`863`	`{`
`865`	`864`	`int err;`
`866`	`865`	`u32 perm;`
Original file line number	Diff line number	Diff line change
`@@ -241,8 +241,7 @@ v9fs_vfs_create_dotl(struct inode dir, struct dentry dentry, umode_t omode,`
`241`	`241`
`242`	`242`	`static int`
`243`	`243`	`v9fs_vfs_atomic_open_dotl(struct inode dir, struct dentry dentry,`
`244`		`- struct file *file, unsigned flags, umode_t omode,`
`245`		`- int *opened)`
	`244`	`+ struct file *file, unsigned flags, umode_t omode)`
`246`	`245`	`{`
`247`	`246`	`int err = 0;`
`248`	`247`	`kgid_t gid;`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ static int bad_inode_update_time(struct inode inode, struct timespec64 time,`
`134`	`134`
`135`	`135`	`static int bad_inode_atomic_open(struct inode inode, struct dentry dentry,`
`136`	`136`	`struct file *file, unsigned int open_flag,`
`137`		`- umode_t create_mode, int *opened)`
	`137`	`+ umode_t create_mode)`
`138`	`138`	`{`
`139`	`139`	`return -EIO;`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -465,8 +465,7 @@ cifs_do_create(struct inode inode, struct dentry direntry, unsigned int xid,`
`465`	`465`
`466`	`466`	`int`
`467`	`467`	`cifs_atomic_open(struct inode inode, struct dentry direntry,`
`468`		`- struct file *file, unsigned oflags, umode_t mode,`
`469`		`- int *opened)`
	`468`	`+ struct file *file, unsigned oflags, umode_t mode)`
`470`	`469`	`{`
`471`	`470`	`int rc;`
`472`	`471`	`unsigned int xid;`
Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,7 @@ static int fuse_create_open(struct inode dir, struct dentry entry,`
`489`	`489`	`static int fuse_mknod(struct inode , struct dentry , umode_t, dev_t);`
`490`	`490`	`static int fuse_atomic_open(struct inode dir, struct dentry entry,`
`491`	`491`	`struct file *file, unsigned flags,`
`492`		`- umode_t mode, int *opened)`
	`492`	`+ umode_t mode)`
`493`	`493`	`{`
`494`	`494`	`int err;`
`495`	`495`	`struct fuse_conn *fc = get_fuse_conn(dir);`