diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-07-24 00:28:09 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-07-24 00:48:05 +0200 |
| commit | 41206a073ceebc517245677a19f52ba6379b33a9 (patch) | |
| tree | 2fc35aac6abe32b99058ad55b0fc6e4d449d1056 /net/sunrpc/rpc_pipe.c | |
| parent | Merge tag 'amd-drm-next-5.9-2020-07-17' of git://people.freedesktop.org/~agd5... (diff) | |
| parent | Linux 5.8-rc6 (diff) | |
| download | linux-41206a073ceebc517245677a19f52ba6379b33a9.tar.xz linux-41206a073ceebc517245677a19f52ba6379b33a9.zip | |
Merge v5.8-rc6 into drm-next
I've got a silent conflict + two trees based on fixes to merge.
Fixes a silent merge with amdgpu
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'net/sunrpc/rpc_pipe.c')
| -rw-r--r-- | net/sunrpc/rpc_pipe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 39e14d5edaf1..e9d0953522f0 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -1317,6 +1317,7 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data) q.len = strlen(gssd_dummy_clnt_dir[0].name); clnt_dentry = d_hash_and_lookup(gssd_dentry, &q); if (!clnt_dentry) { + __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1); pipe_dentry = ERR_PTR(-ENOENT); goto out; } |