summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-10-23 20:22:31 +0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-11-05 04:53:49 +0300
commit7488cbc2568391d5e0b2bda8902a96b5dd7b1ea7 (patch)
tree97e18a667b432056745be29d07d4aa1559b50dd6 /fs
parent809fd143de8805970eec02c27c0bc2622a6ecbda (diff)
downloadlinux-7488cbc2568391d5e0b2bda8902a96b5dd7b1ea7.tar.xz
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.c10
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;