make ->atomic_open() return int

Change of calling conventions:
old		new
NULL		1
file		0
ERR_PTR(-ve)	-ve

Caller *knows* that struct file *; no need to return it.

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

2 files changed, 11 insertions, 12 deletions

diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 92a7c3d8a031..58d9aca46a40 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -46,9 +46,9 @@ extern const struct inode_operations cifs_dir_inode_ops;
 extern struct inode *cifs_root_iget(struct super_block *);
 extern int cifs_create(struct inode *, struct dentry *, umode_t,
                        struct nameidata *);
-extern struct file *cifs_atomic_open(struct inode *, struct dentry *,
-                                     struct opendata *, unsigned, umode_t,
-                                     int *);
+extern int cifs_atomic_open(struct inode *, struct dentry *,
+                            struct opendata *, unsigned, umode_t,
+                            int *);
 extern struct dentry *cifs_lookup(struct inode *, struct dentry *,
                                   struct nameidata *);
 extern int cifs_unlink(struct inode *dir, struct dentry *dentry);
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 6cdf23fd70ee..8ca70b102b95 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -376,7 +376,7 @@ out:
         return rc;
 }
 
-struct file *
+int
 cifs_atomic_open(struct inode *inode, struct dentry *direntry,
                  struct opendata *od, unsigned oflags, umode_t mode,
                  int *opened)
@@ -403,15 +403,15 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
         if (!(oflags & O_CREAT)) {
                 struct dentry *res = cifs_lookup(inode, direntry, NULL);
                 if (IS_ERR(res))
-                        return ERR_CAST(res);
+                        return PTR_ERR(res);
 
                 finish_no_open(od, res);
-                return NULL;
+                return 1;
         }
 
         rc = check_name(direntry);
         if (rc)
-                return ERR_PTR(rc);
+                return rc;
 
         xid = GetXid();
 
@@ -428,13 +428,12 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
         rc = cifs_do_create(inode, direntry, xid, tlink, oflags, mode,
                             &oplock, &fileHandle, opened);
 
-        if (rc) {
-                filp = ERR_PTR(rc);
+        if (rc)
                 goto out;
-        }
 
         filp = finish_open(od, direntry, generic_file_open, opened);
         if (IS_ERR(filp)) {
+                rc = PTR_ERR(filp);
                 CIFSSMBClose(xid, tcon, fileHandle);
                 goto out;
         }
@@ -443,14 +442,14 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
         if (pfile_info == NULL) {
                 CIFSSMBClose(xid, tcon, fileHandle);
                 fput(filp);
-                filp = ERR_PTR(-ENOMEM);
+                rc = -ENOMEM;
         }
 
 out:
         cifs_put_tlink(tlink);
 free_xid:
         FreeXid(xid);
-        return filp;
+        return rc;
 }
 
 int cifs_create(struct inode *inode, struct dentry *direntry, umode_t mode,