getting rid of 'opened' argument of ->atomic_open() - part 1

'opened' argument of finish_open() is unused.  Kill it.

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

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 5669297..7b6ff32 100644 (file)
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -917,7 +917,7 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
                v9inode->writeback_fid = (void *) inode_fid;
        }
        mutex_unlock(&v9inode->v_mutex);
-       err = finish_open(file, dentry, generic_file_open, opened);
+       err = finish_open(file, dentry, generic_file_open);
        if (err)
                goto error;
 

diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index ee65db5..c6939b7 100644 (file)
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -352,7 +352,7 @@ 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 */
-       err = finish_open(file, dentry, generic_file_open, opened);
+       err = finish_open(file, dentry, generic_file_open);
        if (err)
                goto err_clunk_old_fid;
        file->private_data = ofid;

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 38a63ff..38b28cb 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -509,7 +509,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
                        ceph_init_inode_acls(d_inode(dentry), &acls);
                        file->f_mode |= FMODE_CREATED;
                }
-               err = finish_open(file, dentry, ceph_open, opened);
+               err = finish_open(file, dentry, ceph_open);
        }
 out_req:
        if (!req->r_err && req->r_target_inode)

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 21d7e39..891bfd6 100644 (file)
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -541,7 +541,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
        if ((oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
                file->f_mode |= FMODE_CREATED;
 
-       rc = finish_open(file, direntry, generic_file_open, opened);
+       rc = finish_open(file, direntry, generic_file_open);
        if (rc) {
                if (server->ops->close)
                        server->ops->close(xid, tcon, &fid);

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index d4bdcf5..a5b1f5f 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -469,7 +469,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
        d_instantiate(entry, inode);
        fuse_change_entry_timeout(entry, &outentry);
        fuse_invalidate_attr(dir);
-       err = finish_open(file, entry, generic_file_open, opened);
+       err = finish_open(file, entry, generic_file_open);
        if (err) {
                fuse_sync_release(ff, flags);
        } else {

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 4aba00a..59f695e 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -626,7 +626,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
                error = 0;
                if (file) {
                        if (S_ISREG(inode->i_mode))
-                               error = finish_open(file, dentry, gfs2_open_common, opened);
+                               error = finish_open(file, dentry, gfs2_open_common);
                        else
                                error = finish_no_open(file, NULL);
                }
@@ -768,7 +768,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
        d_instantiate(dentry, inode);
        if (file) {
                file->f_mode |= FMODE_CREATED;
-               error = finish_open(file, dentry, gfs2_open_common, opened);
+               error = finish_open(file, dentry, gfs2_open_common);
        }
        gfs2_glock_dq_uninit(ghs);
        gfs2_glock_dq_uninit(ghs + 1);
@@ -866,7 +866,7 @@ static struct dentry *__gfs2_lookup(struct inode *dir, struct dentry *dentry,
                return d;
        }
        if (file && S_ISREG(inode->i_mode))
-               error = finish_open(file, dentry, gfs2_open_common, opened);
+               error = finish_open(file, dentry, gfs2_open_common);
 
        gfs2_glock_dq_uninit(&gh);
        if (error) {

diff --git a/fs/namei.c b/fs/namei.c
index d2aeb28..117b118 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3475,7 +3475,7 @@ static int do_tmpfile(struct nameidata *nd, unsigned flags,
        if (error)
                goto out2;
        file->f_path.mnt = path.mnt;
-       error = finish_open(file, child, NULL, opened);
+       error = finish_open(file, child, NULL);
 out2:
        mnt_drop_write(path.mnt);
 out:

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 0ac5098..22176a3 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1439,7 +1439,7 @@ static int nfs_finish_open(struct nfs_open_context *ctx,
 {
        int err;
 
-       err = finish_open(file, dentry, do_open, opened);
+       err = finish_open(file, dentry, do_open);
        if (err)
                goto out;
        if (S_ISREG(file->f_path.dentry->d_inode->i_mode))

diff --git a/fs/open.c b/fs/open.c
index d2030a3..dbaac9e 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -843,8 +843,7 @@ cleanup_file:
  * Returns zero on success or -errno if the open failed.
  */
 int finish_open(struct file *file, struct dentry *dentry,
-               int (*open)(struct inode *, struct file *),
-               int *opened)
+               int (*open)(struct inode *, struct file *))
 {
        BUG_ON(file->f_mode & FMODE_OPENED); /* once it's opened, it's opened */
 

diff --git a/include/linux/fs.h b/include/linux/fs.h
index ca668c7..70be3e4 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2441,8 +2441,7 @@ enum {
        FILE_OPENED = 2
 };
 extern int finish_open(struct file *file, struct dentry *dentry,
-                       int (*open)(struct inode *, struct file *),
-                       int *opened);
+                       int (*open)(struct inode *, struct file *));
 extern int finish_no_open(struct file *file, struct dentry *dentry);
 
 /* fs/ioctl.c */