LU-12355 llite: vfs atomic_open change with FMODE_CREATED

[fs/lustre-release.git] / lustre / llite / namei.c

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index eb5b5f9..f442a5a 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -946,13 +946,33 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry,
        return de;
 }
 
+#ifdef FMODE_CREATED /* added in Linux v4.18-rc1-20-g73a09dd */
+# define ll_is_opened(o, f)            ((f)->f_mode & FMODE_OPENED)
+# define ll_finish_open(f, d, o)       finish_open((f), (d), NULL)
+# define ll_last_arg
+# define ll_set_created(o, f)                                          \
+do {                                                                   \
+       (f)->f_mode |= FMODE_CREATED;                                   \
+} while (0)
+
+#else
+# define ll_is_opened(o, f)            (*(o))
+# define ll_finish_open(f, d, o)       finish_open((f), (d), NULL, (o))
+# define ll_last_arg                   , int *opened
+# define ll_set_created(o, f)                                          \
+do {                                                                   \
+       *(o) |= FILE_CREATED;                                           \
+} while (0)
+
+#endif
+
 /*
  * For cached negative dentry and new dentry, handle lookup/create/open
  * together.
  */
 static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
                          struct file *file, unsigned open_flags,
-                         umode_t mode, int *opened)
+                         umode_t mode ll_last_arg)
 {
        struct lookup_intent *it;
        struct dentry *de;
@@ -968,7 +988,8 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
        CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p), file %p,"
                           "open_flags %x, mode %x opened %d\n",
               dentry->d_name.len, dentry->d_name.name,
-              PFID(ll_inode2fid(dir)), dir, file, open_flags, mode, *opened);
+              PFID(ll_inode2fid(dir)), dir, file, open_flags, mode,
+              ll_is_opened(opened, file));
 
        /* Only negative dentries enter here */
        LASSERT(dentry->d_inode == NULL);
@@ -1045,8 +1066,7 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
                                        GOTO(out_release, rc);
                                }
                        }
-
-                       *opened |= FILE_CREATED;
+                       ll_set_created(opened, file);
                }
 
                if (dentry->d_inode && it_disposition(it, DISP_OPEN_OPEN)) {
@@ -1058,7 +1078,7 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
                                rc = finish_no_open(file, de);
                        } else {
                                file->private_data = it;
-                               rc = finish_open(file, dentry, NULL, opened);
+                               rc = ll_finish_open(file, dentry, opened);
                                /* We dget in ll_splice_alias. finish_open takes
                                 * care of dget for fd open.
                                 */