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, 5 insertions, 6 deletions

diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 58d9aca46a40..48bb474ce294 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -47,7 +47,7 @@ extern struct inode *cifs_root_iget(struct super_block *);
 extern int cifs_create(struct inode *, struct dentry *, umode_t,
                        struct nameidata *);
 extern int cifs_atomic_open(struct inode *, struct dentry *,
-                            struct opendata *, unsigned, umode_t,
+                            struct file *, unsigned, umode_t,
                             int *);
 extern struct dentry *cifs_lookup(struct inode *, struct dentry *,
                                   struct nameidata *);
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 8ca70b102b95..c00c192f17e9 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -378,7 +378,7 @@ out:
 
 int
 cifs_atomic_open(struct inode *inode, struct dentry *direntry,
-                 struct opendata *od, unsigned oflags, umode_t mode,
+                 struct file *file, unsigned oflags, umode_t mode,
                  int *opened)
 {
         int rc;
@@ -405,7 +405,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
                 if (IS_ERR(res))
                         return PTR_ERR(res);
 
-                finish_no_open(od, res);
+                finish_no_open(file, res);
                 return 1;
         }
 
@@ -431,9 +431,8 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
         if (rc)
                 goto out;
 
-        filp = finish_open(od, direntry, generic_file_open, opened);
-        if (IS_ERR(filp)) {
-                rc = PTR_ERR(filp);
+        rc = finish_open(file, direntry, generic_file_open, opened);
+        if (rc) {
                 CIFSSMBClose(xid, tcon, fileHandle);
                 goto out;
         }