diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2018-12-11 20:58:20 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-12-11 20:58:20 +0100 |
| commit | 66693960f574aa830986e1603657af36423b24eb (patch) | |
| tree | 035aae54d64d79e514f95e18cc3dcf411a98c55e /fs/exportfs/expfs.c | |
| parent | 3ca3f86f7f4856222a8b697d60d32717160a1a1b (diff) | |
| parent | 40e020c129cfc991e8ab4736d2665351ffd1468d (diff) | |
| download | linux-66693960f574aa830986e1603657af36423b24eb.tar.gz linux-66693960f574aa830986e1603657af36423b24eb.tar.bz2 linux-66693960f574aa830986e1603657af36423b24eb.zip | |
Merge tag 'v4.20-rc6' into i2c/for-5.0
Linux 4.20-rc6
Diffstat (limited to 'fs/exportfs/expfs.c')
| -rw-r--r-- | fs/exportfs/expfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index 645158dc33f1..c69927bed4ef 100644 --- a/fs/exportfs/expfs.c +++ b/fs/exportfs/expfs.c @@ -77,7 +77,7 @@ static bool dentry_connected(struct dentry *dentry) struct dentry *parent = dget_parent(dentry); dput(dentry); - if (IS_ROOT(dentry)) { + if (dentry == parent) { dput(parent); return false; } @@ -147,6 +147,7 @@ static struct dentry *reconnect_one(struct vfsmount *mnt, tmp = lookup_one_len_unlocked(nbuf, parent, strlen(nbuf)); if (IS_ERR(tmp)) { dprintk("%s: lookup failed: %d\n", __func__, PTR_ERR(tmp)); + err = PTR_ERR(tmp); goto out_err; } if (tmp != dentry) { |