diff options
author | Miklos Szeredi <mszeredi@redhat.com> | 2016-12-16 11:02:56 +0100 |
---|---|---|
committer | Miklos Szeredi <mszeredi@redhat.com> | 2016-12-16 11:02:56 +0100 |
commit | 2b8c30e9ef1492c34099b97365115504f6cd6995 (patch) | |
tree | cf6b4a4bdac41a176a22e5f147b06d0244c1716a /fs/overlayfs | |
parent | 8ee6059c58ea525f76b4efb98f8f66845f697efc (diff) | |
download | blackbird-obmc-linux-2b8c30e9ef1492c34099b97365115504f6cd6995.tar.gz blackbird-obmc-linux-2b8c30e9ef1492c34099b97365115504f6cd6995.zip |
ovl: use d_is_dir()
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs')
-rw-r--r-- | fs/overlayfs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index a19fbcde16bd..212e746320b3 100644 --- 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; } |