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>

1 files changed, 4 insertions, 6 deletions

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index de626b3b342f..62ce8daefa95 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -856,7 +856,7 @@ error:
         return ERR_PTR(result);
 }
 
-static struct file *
+static int
 v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
                      struct opendata *od, unsigned flags, umode_t mode,
                      int *opened)
@@ -872,7 +872,7 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
         if (d_unhashed(dentry)) {
                 res = v9fs_vfs_lookup(dir, dentry, NULL);
                 if (IS_ERR(res))
-                        return ERR_CAST(res);
+                        return PTR_ERR(res);
 
                 if (res)
                         dentry = res;
@@ -881,7 +881,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);
-                return NULL;
+                return 1;
         }
 
         err = 0;
@@ -933,13 +933,11 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
         *opened |= FILE_CREATED;
 out:
         dput(res);
-        return filp;
+        return err;
 
 error:
         if (fid)
                 p9_client_clunk(fid);
-
-        filp = ERR_PTR(err);
         goto out;
 }