kill struct opendata

Just pass struct file *.  Methods are happier that way...
There's no need to return struct file * from finish_open() now,
so let it return int.  Next: saner prototypes for parts in
namei.c

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 12 insertions, 18 deletions

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 62ce8daefa95..2b05651e0c3d 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -858,12 +858,11 @@ error:
 
 static int
 v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
-                     struct opendata *od, unsigned flags, umode_t mode,
+                     struct file *file, unsigned flags, umode_t mode,
                      int *opened)
 {
         int err;
         u32 perm;
-        struct file *filp;
         struct v9fs_inode *v9inode;
         struct v9fs_session_info *v9ses;
         struct p9_fid *fid, *inode_fid;
@@ -880,7 +879,7 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
 
         /* Only creates */
         if (!(flags & O_CREAT) || dentry->d_inode) {
-                finish_no_open(od, res);
+                finish_no_open(file, res);
                 return 1;
         }
 
@@ -918,16 +917,14 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
                 v9inode->writeback_fid = (void *) inode_fid;
         }
         mutex_unlock(&v9inode->v_mutex);
-        filp = finish_open(od, dentry, generic_file_open, opened);
-        if (IS_ERR(filp)) {
-                err = PTR_ERR(filp);
+        err = finish_open(file, dentry, generic_file_open, opened);
+        if (err)
                 goto error;
-        }
 
-        filp->private_data = fid;
+        file->private_data = fid;
 #ifdef CONFIG_9P_FSCACHE
         if (v9ses->cache)
-                v9fs_cache_inode_set_cookie(dentry->d_inode, filp);
+                v9fs_cache_inode_set_cookie(dentry->d_inode, file);
 #endif
 
         *opened |= FILE_CREATED;
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 69f05109f75d..cfaebdef9743 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -242,14 +242,13 @@ 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 opendata *od, unsigned flags, umode_t omode,
+                          struct file *file, unsigned flags, umode_t omode,
                           int *opened)
 {
         int err = 0;
         gid_t gid;
         umode_t mode;
         char *name = NULL;
-        struct file *filp;
         struct p9_qid qid;
         struct inode *inode;
         struct p9_fid *fid = NULL;
@@ -270,7 +269,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
 
         /* Only creates */
         if (!(flags & O_CREAT) || dentry->d_inode) {
-                finish_no_open(od, res);
+                finish_no_open(file, res);
                 return 1;
         }
 
@@ -357,15 +356,13 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
         }
         mutex_unlock(&v9inode->v_mutex);
         /* Since we are opening a file, assign the open fid to the file */
-        filp = finish_open(od, dentry, generic_file_open, opened);
-        if (IS_ERR(filp)) {
-                err = PTR_ERR(filp);
+        err = finish_open(file, dentry, generic_file_open, opened);
+        if (err)
                 goto err_clunk_old_fid;
-        }
-        filp->private_data = ofid;
+        file->private_data = ofid;
 #ifdef CONFIG_9P_FSCACHE
         if (v9ses->cache)
-                v9fs_cache_inode_set_cookie(inode, filp);
+                v9fs_cache_inode_set_cookie(inode, file);
 #endif
         *opened |= FILE_CREATED;
 out: