diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-02 18:14:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-02 18:14:01 +0200 |
| commit | 27787ba3fa4904422b3928b898d1bd3d74d98bea (patch) | |
| tree | 72fce8989a8214f927f3afccaa39d11de38ccb59 /fs/nilfs2 | |
| parent | Merge branch 'work.ecryptfs' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | useful constants: struct qstr for ".." (diff) | |
| download | linux-27787ba3fa4904422b3928b898d1bd3d74d98bea.tar.xz linux-27787ba3fa4904422b3928b898d1bd3d74d98bea.zip | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted stuff all over the place"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
useful constants: struct qstr for ".."
hostfs_open(): don't open-code file_dentry()
whack-a-mole: kill strlen_user() (again)
autofs: should_expire() argument is guaranteed to be positive
apparmor:match_mn() - constify devpath argument
buffer: a small optimization in grow_buffers
get rid of autofs_getpath()
constify dentry argument of dentry_path()/dentry_path_raw()
Diffstat (limited to 'fs/nilfs2')
| -rw-r--r-- | fs/nilfs2/namei.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c index 189bd1007a2f..91eebeb0c48b 100644 --- a/fs/nilfs2/namei.c +++ b/fs/nilfs2/namei.c @@ -440,10 +440,9 @@ static struct dentry *nilfs_get_parent(struct dentry *child) { unsigned long ino; struct inode *inode; - struct qstr dotdot = QSTR_INIT("..", 2); struct nilfs_root *root; - ino = nilfs_inode_by_name(d_inode(child), &dotdot); + ino = nilfs_inode_by_name(d_inode(child), &dotdot_name); if (!ino) return ERR_PTR(-ENOENT); |