diff options
| author | Linus Torvalds | 2016-06-20 10:41:51 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2016-06-20 10:41:51 -0700 |
| commit | 67016f6cdfd079e632bbc49e33178b2d558c120a (patch) | |
| tree | 086f6dc06468a9b565b0f6dad6b218e2ecc1956b /fs/libfs.c | |
| parent | f780f00d723d991353b2a97a8a844ffefbc40505 (diff) | |
| parent | e7d6ef9790bc281f5c29d0132b68031248523fe8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"A couple more of d_walk()/d_subdirs reordering fixes (stable fodder;
ought to solve that crap for good) and a fix for a brown paperbag bug
in d_alloc_parallel() (this cycle)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fix idiotic braino in d_alloc_parallel()
autofs races
much milder d_walk() race
Diffstat (limited to 'fs/libfs.c')
| -rw-r--r-- | fs/libfs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/libfs.c b/fs/libfs.c index 3db2721144c2..cedeacbae303 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -71,9 +71,7 @@ EXPORT_SYMBOL(simple_lookup); int dcache_dir_open(struct inode *inode, struct file *file) { - static struct qstr cursor_name = QSTR_INIT(".", 1); - - file->private_data = d_alloc(file->f_path.dentry, &cursor_name); + file->private_data = d_alloc_cursor(file->f_path.dentry); return file->private_data ? 0 : -ENOMEM; } |