Use the right predicate in ->atomic_open() instances

->atomic_open() can be given an in-lookup dentry *or* a negative one
found in dcache.  Use d_in_lookup() to tell one from another, rather
than d_unhashed().

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

7 files changed, 7 insertions, 7 deletions

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index f4645c515262..e2e7c749925a 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -853,7 +853,7 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
         struct p9_fid *fid, *inode_fid;
         struct dentry *res = NULL;
 
-        if (d_unhashed(dentry)) {
+        if (d_in_lookup(dentry)) {
                 res = v9fs_vfs_lookup(dir, dentry, 0);
                 if (IS_ERR(res))
                         return PTR_ERR(res);
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index a34702c998f5..1b51eaa5e2dd 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -254,7 +254,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
         struct posix_acl *pacl = NULL, *dacl = NULL;
         struct dentry *res = NULL;
 
-        if (d_unhashed(dentry)) {
+        if (d_in_lookup(dentry)) {
                 res = v9fs_vfs_lookup(dir, dentry, 0);
                 if (IS_ERR(res))
                         return PTR_ERR(res);
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index ce2f5795e44b..0daaf7ceedc5 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -394,7 +394,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
         if ((flags & O_CREAT) && !req->r_reply_info.head->is_dentry)
                 err = ceph_handle_notrace_create(dir, dentry);
 
-        if (d_unhashed(dentry)) {
+        if (d_in_lookup(dentry)) {
                 dn = ceph_finish_lookup(req, dentry, err);
                 if (IS_ERR(dn))
                         err = PTR_ERR(dn);
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index c3eb998a99bd..fb0903fffc22 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -445,7 +445,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
                  * Check for hashed negative dentry. We have already revalidated
                  * the dentry and it is fine. No need to perform another lookup.
                  */
-                if (!d_unhashed(direntry))
+                if (!d_in_lookup(direntry))
                         return -ENOENT;
 
                 res = cifs_lookup(inode, direntry, 0);
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 264f07c7754e..cca7b048c07b 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -480,7 +480,7 @@ static int fuse_atomic_open(struct inode *dir, struct dentry *entry,
         struct fuse_conn *fc = get_fuse_conn(dir);
         struct dentry *res = NULL;
 
-        if (d_unhashed(entry)) {
+        if (d_in_lookup(entry)) {
                 res = fuse_lookup(dir, entry, 0);
                 if (IS_ERR(res))
                         return PTR_ERR(res);
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 21dc784f66c2..9bad79fede37 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1189,7 +1189,7 @@ static int gfs2_atomic_open(struct inode *dir, struct dentry *dentry,
         struct dentry *d;
         bool excl = !!(flags & O_EXCL);
 
-        if (!d_unhashed(dentry))
+        if (!d_in_lookup(dentry))
                 goto skip_lookup;
 
         d = __gfs2_lookup(dir, dentry, file, opened);
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index d8015a03db4c..3d5eb5edbf50 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1504,7 +1504,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
 
         /* NFS only supports OPEN on regular files */
         if ((open_flags & O_DIRECTORY)) {
-                if (!d_unhashed(dentry)) {
+                if (!d_in_lookup(dentry)) {
                         /*
                          * Hashed negative dentry with O_DIRECTORY: dentry was
                          * revalidated and is fine, no need to perform lookup