diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-02 09:14:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-02 09:14:01 -0700 |
commit | 27787ba3fa4904422b3928b898d1bd3d74d98bea (patch) | |
tree | 72fce8989a8214f927f3afccaa39d11de38ccb59 /fs/fuse | |
parent | b28866f4bb77095c262dfd5783197b691c624fa6 (diff) | |
parent | 80e5d1ff5d5f1ed5167a69b7c2fe86071b615f6b (diff) |
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/fuse')
-rw-r--r-- | fs/fuse/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 6c995201cd4d..393e36b74dc4 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -873,14 +873,13 @@ static struct dentry *fuse_get_parent(struct dentry *child) struct inode *inode; struct dentry *parent; struct fuse_entry_out outarg; - const struct qstr name = QSTR_INIT("..", 2); int err; if (!fc->export_support) return ERR_PTR(-ESTALE); err = fuse_lookup_name(child_inode->i_sb, get_node_id(child_inode), - &name, &outarg, &inode); + &dotdot_name, &outarg, &inode); if (err) { if (err == -ENOENT) return ERR_PTR(-ESTALE); |