[PATCH 3.2 051/102] vfs: Fold follow_mount_rcu() into follow_dotdot_rcu()
3.2.64-rc1 review patch. If anyone has any objections, please let me know.
--
From: Ben Hutchings
This is needed before commit 4023bfc9f351 ('be careful with nd->inode
in path_init() and follow_dotdot_rcu()'). A similar change was made
upstream as part of commit b37199e626b3 ('rcuwalk: recheck mount_lock
after mountpoint crossing attempts').
Signed-off-by: Ben Hutchings
---
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -911,19 +911,6 @@ static bool __follow_mount_rcu(struct na
return true;
}
-static void follow_mount_rcu(struct nameidata *nd)
-{
- while (d_mountpoint(nd->path.dentry)) {
- struct vfsmount *mounted;
- mounted = __lookup_mnt(nd->path.mnt, nd->path.dentry, 1);
- if (!mounted)
- break;
- nd->path.mnt = mounted;
- nd->path.dentry = mounted->mnt_root;
- nd->seq = read_seqcount_begin(>path.dentry->d_seq);
- }
-}
-
static int follow_dotdot_rcu(struct nameidata *nd)
{
if (!nd->root.mnt)
@@ -950,7 +937,15 @@ static int follow_dotdot_rcu(struct name
break;
nd->seq = read_seqcount_begin(>path.dentry->d_seq);
}
- follow_mount_rcu(nd);
+ while (d_mountpoint(nd->path.dentry)) {
+ struct vfsmount *mounted;
+ mounted = __lookup_mnt(nd->path.mnt, nd->path.dentry, 1);
+ if (!mounted)
+ break;
+ nd->path.mnt = mounted;
+ nd->path.dentry = mounted->mnt_root;
+ nd->seq = read_seqcount_begin(>path.dentry->d_seq);
+ }
nd->inode = nd->path.dentry->d_inode;
return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3.2 051/102] vfs: Fold follow_mount_rcu() into follow_dotdot_rcu()
3.2.64-rc1 review patch. If anyone has any objections, please let me know.
--
From: Ben Hutchings b...@decadent.org.uk
This is needed before commit 4023bfc9f351 ('be careful with nd-inode
in path_init() and follow_dotdot_rcu()'). A similar change was made
upstream as part of commit b37199e626b3 ('rcuwalk: recheck mount_lock
after mountpoint crossing attempts').
Signed-off-by: Ben Hutchings b...@decadent.org.uk
---
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -911,19 +911,6 @@ static bool __follow_mount_rcu(struct na
return true;
}
-static void follow_mount_rcu(struct nameidata *nd)
-{
- while (d_mountpoint(nd-path.dentry)) {
- struct vfsmount *mounted;
- mounted = __lookup_mnt(nd-path.mnt, nd-path.dentry, 1);
- if (!mounted)
- break;
- nd-path.mnt = mounted;
- nd-path.dentry = mounted-mnt_root;
- nd-seq = read_seqcount_begin(nd-path.dentry-d_seq);
- }
-}
-
static int follow_dotdot_rcu(struct nameidata *nd)
{
if (!nd-root.mnt)
@@ -950,7 +937,15 @@ static int follow_dotdot_rcu(struct name
break;
nd-seq = read_seqcount_begin(nd-path.dentry-d_seq);
}
- follow_mount_rcu(nd);
+ while (d_mountpoint(nd-path.dentry)) {
+ struct vfsmount *mounted;
+ mounted = __lookup_mnt(nd-path.mnt, nd-path.dentry, 1);
+ if (!mounted)
+ break;
+ nd-path.mnt = mounted;
+ nd-path.dentry = mounted-mnt_root;
+ nd-seq = read_seqcount_begin(nd-path.dentry-d_seq);
+ }
nd-inode = nd-path.dentry-d_inode;
return 0;
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
