diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:43 +0800 |
| commit | 241bca50dd1ae71a7cd7eebe579bd131bf986167 (patch) | |
| tree | f9d4af30aefba27b3c00074d935f8b5b01d54939 /fs/nfs/nfs4proc.c | |
| parent | 1ebca975cbc0ab4708126e26bf2729777184f1e6 (diff) | |
| parent | 5cc3b58828a8bb2ebb34de96d1aec1564f912a31 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.03-android
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 2c4f41c34366..84706204cc33 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2331,9 +2331,9 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, dentry = d_add_unique(dentry, igrab(state->inode)); if (dentry == NULL) { dentry = opendata->dentry; - } else if (dentry != ctx->dentry) { + } else { dput(ctx->dentry); - ctx->dentry = dget(dentry); + ctx->dentry = dentry; } nfs_set_verifier(dentry, nfs_save_change_attribute(d_inode(opendata->dir))); |