leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ovl-fixes' into for-linus

Browse Source 
Backmerge to resolve a conflict in ovl_lookup_real();
"ovl_lookup_real(): use lookup_one_len_unlocked()" instead,
but it was too late in the cycle to rebase.
This commit is contained in:
Al Viro
2016-05-17 02:17:59 -04:00
parent ae05327a00 38b78a5f18
commit 0e0162bb8c
745 changed files with 7528 additions and 4037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/overlayfs/super.c
View File

@@ -411,7 +411,7 @@ static inline struct dentry *ovl_lookup_real(struct dentry *dir,
{
struct dentry *dentry;
dentry = lookup_one_len_unlocked(name->name, dir, name->len);
dentry = lookup_hash(name, dir);
if (IS_ERR(dentry)) {
if (PTR_ERR(dentry) == -ENOENT)