diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-01-23 20:10:29 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-03 14:07:54 -0500 |
commit | 3899167dbd6832a3d8d7171b425257ad46b6c40c (patch) | |
tree | 2a3bc9562e061c03c444e4ab1d5df2a3d9e15680 | |
parent | f598f9f1252b33410ffc52f51e117645ac5116c4 (diff) |
Get rid of mnt_mountpoint abuses in ext4
path to mnt/mnt->mnt_root is no worse than that to
mnt->mnt_parent/mnt->mnt_mountpoint *and* needs no
pinning the sucker down (mnt is not going away and
mnt->mnt_root won't change)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/ext4/file.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 9630583cef28..56eee3d796c2 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c | |||
@@ -116,11 +116,9 @@ static int ext4_file_open(struct inode * inode, struct file * filp) | |||
116 | * devices or filesystem images. | 116 | * devices or filesystem images. |
117 | */ | 117 | */ |
118 | memset(buf, 0, sizeof(buf)); | 118 | memset(buf, 0, sizeof(buf)); |
119 | path.mnt = mnt->mnt_parent; | 119 | path.mnt = mnt; |
120 | path.dentry = mnt->mnt_mountpoint; | 120 | path.dentry = mnt->mnt_root; |
121 | path_get(&path); | ||
122 | cp = d_path(&path, buf, sizeof(buf)); | 121 | cp = d_path(&path, buf, sizeof(buf)); |
123 | path_put(&path); | ||
124 | if (!IS_ERR(cp)) { | 122 | if (!IS_ERR(cp)) { |
125 | memcpy(sbi->s_es->s_last_mounted, cp, | 123 | memcpy(sbi->s_es->s_last_mounted, cp, |
126 | sizeof(sbi->s_es->s_last_mounted)); | 124 | sizeof(sbi->s_es->s_last_mounted)); |