introduce FMODE_CREATED and switch to it

Parallel to FILE_CREATED, goes into ->f_mode instead of *opened.
NFS is a bit of a wart here - it doesn't have file at the point
where FILE_CREATED used to be set, so we need to propagate it
there (for now).  IMA is another one (here and everywhere)...

Note that this needs do_dentry_open() to leave old bits in ->f_mode
alone - we want it to preserve FMODE_CREATED if it had been already
set (no other bit can be there).

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
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 42e102e2e74a4084c4f8ddb2bbdab825d8ed0d73..5669297924804e2d1e84b5aa63026a1b62825aaf 100644 (file)
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -925,7 +925,7 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
        if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)
                v9fs_cache_inode_set_cookie(d_inode(dentry), file);
 
-       *opened |= FILE_CREATED;
+       file->f_mode |= FMODE_CREATED;
 out:
        dput(res);
        return err;

diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 7f6ae21a27b3ca451d353398b4a0e25cb55a9177..ee65db5c7eb051516b0d9d70d159cd44e0e0a66a 100644 (file)
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -358,7 +358,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
        file->private_data = ofid;
        if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)
                v9fs_cache_inode_set_cookie(inode, file);
-       *opened |= FILE_CREATED;
+       file->f_mode |= FMODE_CREATED;
 out:
        v9fs_put_acl(dacl, pacl);
        dput(res);

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index ad0bed99b1d5ab0c61922ae561cab24d2e9d4933..38a63fff7903eac7bfd8421385c603770b8d6ad8 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -507,7 +507,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
                dout("atomic_open finish_open on dn %p\n", dn);
                if (req->r_op == CEPH_MDS_OP_CREATE && req->r_reply_info.has_create_ino) {
                        ceph_init_inode_acls(d_inode(dentry), &acls);
-                       *opened |= FILE_CREATED;
+                       file->f_mode |= FMODE_CREATED;
                }
                err = finish_open(file, dentry, ceph_open, opened);
        }

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index ddae52bd199318ef6d268c337e4cb0fcdd0fe4b3..21d7e393900e4a30c5ed837ee3284800695f9acc 100644 (file)
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -539,7 +539,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
        }
 
        if ((oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
-               *opened |= FILE_CREATED;
+               file->f_mode |= FMODE_CREATED;
 
        rc = finish_open(file, direntry, generic_file_open, opened);
        if (rc) {

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 56231b31f806b10a15d86006b0686312b5be2cb2..d4bdcf51e6cbfcf66d9fd10507de6836170cd3b8 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -508,7 +508,7 @@ static int fuse_atomic_open(struct inode *dir, struct dentry *entry,
                goto no_open;
 
        /* Only creates */
-       *opened |= FILE_CREATED;
+       file->f_mode |= FMODE_CREATED;
 
        if (fc->no_create)
                goto mknod;

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 67c588edf8d8e738d352c9607f7eca5a4b025eef..4aba00a6004ba5bb24159db7162cb2801b674ce1 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -767,7 +767,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
        mark_inode_dirty(inode);
        d_instantiate(dentry, inode);
        if (file) {
-               *opened |= FILE_CREATED;
+               file->f_mode |= FMODE_CREATED;
                error = finish_open(file, dentry, gfs2_open_common, opened);
        }
        gfs2_glock_dq_uninit(ghs);

diff --git a/fs/namei.c b/fs/namei.c
index 8a1ae074c1c104a48e01a797ac23e72a54215940..4bd7cc0d752255947e53c71c31a3f8c405d5f970 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3061,7 +3061,7 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
                 * permission here.
                 */
                int acc_mode = op->acc_mode;
-               if (*opened & FILE_CREATED) {
+               if (file->f_mode & FMODE_CREATED) {
                        WARN_ON(!(open_flag & O_CREAT));
                        fsnotify_create(dir, dentry);
                        acc_mode = 0;
@@ -3077,7 +3077,7 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
                                dput(dentry);
                                dentry = file->f_path.dentry;
                        }
-                       if (*opened & FILE_CREATED)
+                       if (file->f_mode & FMODE_CREATED)
                                fsnotify_create(dir, dentry);
                        if (unlikely(d_is_negative(dentry))) {
                                error = -ENOENT;
@@ -3126,7 +3126,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
        if (unlikely(IS_DEADDIR(dir_inode)))
                return -ENOENT;
 
-       *opened &= ~FILE_CREATED;
+       file->f_mode &= ~FMODE_CREATED;
        dentry = d_lookup(dir, &nd->last);
        for (;;) {
                if (!dentry) {
@@ -3211,7 +3211,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
 
        /* Negative dentry, just create the file */
        if (!dentry->d_inode && (open_flag & O_CREAT)) {
-               *opened |= FILE_CREATED;
+               file->f_mode |= FMODE_CREATED;
                audit_inode_child(dir_inode, dentry, AUDIT_TYPE_CHILD_CREATE);
                if (!dir_inode->i_op->create) {
                        error = -EACCES;
@@ -3318,7 +3318,7 @@ static int do_last(struct nameidata *nd,
                if (error)
                        goto out;
 
-               if ((*opened & FILE_CREATED) ||
+               if ((file->f_mode & FMODE_CREATED) ||
                    !S_ISREG(file_inode(file)->i_mode))
                        will_truncate = false;
 
@@ -3326,7 +3326,7 @@ static int do_last(struct nameidata *nd,
                goto opened;
        }
 
-       if (*opened & FILE_CREATED) {
+       if (file->f_mode & FMODE_CREATED) {
                /* Don't check for write permission, don't truncate */
                open_flag &= ~O_TRUNC;
                will_truncate = false;
@@ -3400,7 +3400,8 @@ static int do_last(struct nameidata *nd,
        if (error)
                goto out;
 opened:
-       error = ima_file_check(file, op->acc_mode, *opened);
+       error = ima_file_check(file, op->acc_mode,
+                               file->f_mode & FMODE_CREATED ? FILE_CREATED : 0);
        if (!error && will_truncate)
                error = handle_truncate(file);
 out:

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 7a9c14426855309d2bb68e681b2db32321648d0c..0ac50983fc4e54d04dcc7c579ad956506dfec520 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1461,6 +1461,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
        struct inode *inode;
        unsigned int lookup_flags = 0;
        bool switched = false;
+       int created = 0;
        int err;
 
        /* Expect a negative dentry */
@@ -1521,7 +1522,9 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
                goto out;
 
        trace_nfs_atomic_open_enter(dir, ctx, open_flags);
-       inode = NFS_PROTO(dir)->open_context(dir, ctx, open_flags, &attr, opened);
+       inode = NFS_PROTO(dir)->open_context(dir, ctx, open_flags, &attr, &created);
+       if (created)
+               file->f_mode |= FMODE_CREATED;
        if (IS_ERR(inode)) {
                err = PTR_ERR(inode);
                trace_nfs_atomic_open_exit(dir, ctx, open_flags, err);

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ed45090e4df6471902f5968b908429fe28976280..2c4df0ffbca1037a1b243d4a906c510818ba5f8c 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2951,7 +2951,7 @@ static int _nfs4_do_open(struct inode *dir,
                }
        }
        if (opened && opendata->file_created)
-               *opened |= FILE_CREATED;
+               *opened = 1;
 
        if (pnfs_use_threshold(ctx_th, opendata->f_attr.mdsthreshold, server)) {
                *ctx_th = opendata->f_attr.mdsthreshold;

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 05f34726e29c3ce49b09a6d27eaca216953196bf..ca668c7e48a7cbea5454e478ce869bd96e16ab3b 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -149,6 +149,7 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
 #define FMODE_CAN_WRITE         ((__force fmode_t)0x40000)
 
 #define FMODE_OPENED           ((__force fmode_t)0x80000)
+#define FMODE_CREATED          ((__force fmode_t)0x100000)
 
 /* File was opened by fanotify and shouldn't generate fanotify events */
 #define FMODE_NONOTIFY         ((__force fmode_t)0x4000000)