Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
2b8c30e9
Commit
2b8c30e9
authored
Dec 16, 2016
by
Miklos Szeredi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ovl: use d_is_dir()
Signed-off-by:
Miklos Szeredi
<
mszeredi@redhat.com
>
parent
8ee6059c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
fs/overlayfs/super.c
fs/overlayfs/super.c
+2
-2
No files found.
fs/overlayfs/super.c
View file @
2b8c30e9
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment