ovl: use d_is_dir()

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index a19fbcde16bd6bb0a9f5accd793a0d43f260709b..212e746320b3315ae9e7aa0d48b2be5bea1a1d91 100644 (file)
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -82,7 +82,7 @@ enum ovl_path_type ovl_path_type(struct dentry *dentry)
                 * Non-dir dentry can hold lower dentry from previous
                 * location.
                 */
-               if (oe->numlower && S_ISDIR(dentry->d_inode->i_mode))
+               if (oe->numlower && d_is_dir(dentry))
                        type |= __OVL_PATH_MERGE;
        } else {
                if (oe->numlower > 1)
@@ -955,7 +955,7 @@ static int ovl_mount_dir_noesc(const char *name, struct path *path)
                pr_err("overlayfs: filesystem on '%s' not supported\n", name);
                goto out_put;
        }
-       if (!S_ISDIR(path->dentry->d_inode->i_mode)) {
+       if (!d_is_dir(path->dentry)) {
                pr_err("overlayfs: '%s' not a directory\n", name);
                goto out_put;
        }