diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /fs/nfs/nfs4file.c | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'fs/nfs/nfs4file.c')
| -rw-r--r-- | fs/nfs/nfs4file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index 13e6bb3e3fe5..e5b804dd944c 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c | |||
| @@ -69,7 +69,6 @@ nfs4_file_open(struct inode *inode, struct file *filp) | |||
| 69 | goto out_drop; | 69 | goto out_drop; |
| 70 | } | 70 | } |
| 71 | } | 71 | } |
| 72 | iput(inode); | ||
| 73 | if (inode != dentry->d_inode) | 72 | if (inode != dentry->d_inode) |
| 74 | goto out_drop; | 73 | goto out_drop; |
| 75 | 74 | ||