diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /fs/cifs/dir.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'fs/cifs/dir.c')
| -rw-r--r-- | fs/cifs/dir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index d3e2eaa503a6..5384c2a640ca 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
| @@ -500,6 +500,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, | |||
| 500 | if (server->ops->close) | 500 | if (server->ops->close) |
| 501 | server->ops->close(xid, tcon, &fid); | 501 | server->ops->close(xid, tcon, &fid); |
| 502 | cifs_del_pending_open(&open); | 502 | cifs_del_pending_open(&open); |
| 503 | fput(file); | ||
| 503 | rc = -ENOMEM; | 504 | rc = -ENOMEM; |
| 504 | } | 505 | } |
| 505 | 506 | ||