projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v4.0-rc7' into drm-next
[firefly-linux-kernel-4.4.55.git]
/
fs
/
namespace.c
diff --git
a/fs/namespace.c
b/fs/namespace.c
index 72a286e0d33eb37a2ff3cc8a33f7ca5cefcca266..82ef1405260e1cfbe551ffba781fec25f881e918 100644
(file)
--- a/
fs/namespace.c
+++ b/
fs/namespace.c
@@
-1907,8
+1907,8
@@
static int graft_tree(struct mount *mnt, struct mount *p, struct mountpoint *mp)
if (mnt->mnt.mnt_sb->s_flags & MS_NOUSER)
return -EINVAL;
if (mnt->mnt.mnt_sb->s_flags & MS_NOUSER)
return -EINVAL;
- if (
S_ISDIR(mp->m_dentry->d_inode->i_mode
) !=
-
S_ISDIR(mnt->mnt.mnt_root->d_inode->i_mode
))
+ if (
d_is_dir(mp->m_dentry
) !=
+
d_is_dir(mnt->mnt.mnt_root
))
return -ENOTDIR;
return attach_recursive_mnt(mnt, p, mp, NULL);
return -ENOTDIR;
return attach_recursive_mnt(mnt, p, mp, NULL);
@@
-2180,8
+2180,8
@@
static int do_move_mount(struct path *path, const char *old_name)
if (!mnt_has_parent(old))
goto out1;
if (!mnt_has_parent(old))
goto out1;
- if (
S_ISDIR(path->dentry->d_inode->i_mode
) !=
-
S_ISDIR(old_path.dentry->d_inode->i_mode
))
+ if (
d_is_dir(path->dentry
) !=
+
d_is_dir(old_path.dentry
))
goto out1;
/*
* Don't move a mount residing in a shared parent.
goto out1;
/*
* Don't move a mount residing in a shared parent.
@@
-2271,7
+2271,7
@@
static int do_add_mount(struct mount *newmnt, struct path *path, int mnt_flags)
goto unlock;
err = -EINVAL;
goto unlock;
err = -EINVAL;
- if (
S_ISLNK(newmnt->mnt.mnt_root->d_inode->i_mode
))
+ if (
d_is_symlink(newmnt->mnt.mnt_root
))
goto unlock;
newmnt->mnt.mnt_flags = mnt_flags;
goto unlock;
newmnt->mnt.mnt_flags = mnt_flags;