diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-10-23 18:23:03 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-11-05 02:53:50 +0100 |
| commit | dca780016dab84d6ac500b1d84fdfe1628802a59 (patch) | |
| tree | 2e60d8da7cc8e05c1f0b22b140685ca89e722e89 /fs/nfs | |
| parent | Revert "NFS: remove BUG possibility in nfs4_open_and_get_state" (diff) | |
| download | linux-dca780016dab84d6ac500b1d84fdfe1628802a59.tar.xz linux-dca780016dab84d6ac500b1d84fdfe1628802a59.zip | |
Revert "NFS: nfs4_do_open should add negative results to the dcache."
This reverts commit 4fa2c54b5198d09607a534e2fd436581064587ed.
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 8026197e2b9f..41b8fcbfdadd 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2231,15 +2231,8 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, seq = raw_seqcount_begin(&sp->so_reclaim_seqcount); ret = _nfs4_proc_open(opendata); - if (ret != 0) { - if (ret == -ENOENT) { - d_drop(opendata->dentry); - d_add(opendata->dentry, NULL); - nfs_set_verifier(opendata->dentry, - nfs_save_change_attribute(opendata->dir->d_inode)); - } + if (ret != 0) goto out; - } state = nfs4_opendata_to_nfs4_state(opendata); ret = PTR_ERR(state); |