diff options
| author |   Trond Myklebust <trond.myklebust@primarydata.com> | 2014-10-23 19:22:31 +0300 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-11-04 19:53:49 -0600 |
| commit | 7488cbc2568391d5e0b2bda8902a96b5dd7b1ea7 (patch) | |
| tree | 97e18a667b432056745be29d07d4aa1559b50dd6 /fs | |
| parent | NFSv4: Ensure nfs_atomic_open set the dentry verifier on ENOENT (diff) | |
| download | linux-dev-7488cbc2568391d5e0b2bda8902a96b5dd7b1ea7.tar.xz linux-dev-7488cbc2568391d5e0b2bda8902a96b5dd7b1ea7.zip | |
Revert "NFS: remove BUG possibility in nfs4_open_and_get_state"
This reverts commit f39c01047994e66e7f3d89ddb4c6141f23349d8d.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 405bd95c1f58..8026197e2b9f 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2233,13 +2233,9 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, ret = _nfs4_proc_open(opendata); if (ret != 0) { if (ret == -ENOENT) { - dentry = opendata->dentry; - if (dentry->d_inode) - d_delete(dentry); - else if (d_unhashed(dentry)) - d_add(dentry, NULL); - - nfs_set_verifier(dentry, + d_drop(opendata->dentry); + d_add(opendata->dentry, NULL); + nfs_set_verifier(opendata->dentry, nfs_save_change_attribute(opendata->dir->d_inode)); } goto out; |