diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 12:57:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 12:57:59 -0400 |
| commit | 37822188ef7bb41ae47b84ae283e6ac93cdafb9c (patch) | |
| tree | 2c824dab54388d1b862fd0b11ec9bec59b3c8ac2 /fs/cifs/file.c | |
| parent | 5a559057b4fa0f60b2772fb590bf13e90af7a57d (diff) | |
| parent | 2d20ca835867d93ead6ce61780d883a4b128106d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
Eliminate sparse warning - bad constant expression
cifs: check for NULL session password
missing changes during ntlmv2/ntlmssp auth and sign
[CIFS] Fix ntlmv2 auth with ntlmssp
cifs: correction of unicode header files
cifs: fix NULL pointer dereference in cifs_find_smb_ses
cifs: consolidate error handling in several functions
cifs: clean up error handling in cifs_mknod
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index db11fdef0e92..de748c652d11 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
| @@ -242,8 +242,7 @@ int cifs_open(struct inode *inode, struct file *file) | |||
| 242 | full_path = build_path_from_dentry(file->f_path.dentry); | 242 | full_path = build_path_from_dentry(file->f_path.dentry); |
| 243 | if (full_path == NULL) { | 243 | if (full_path == NULL) { |
| 244 | rc = -ENOMEM; | 244 | rc = -ENOMEM; |
| 245 | FreeXid(xid); | 245 | goto out; |
| 246 | return rc; | ||
| 247 | } | 246 | } |
| 248 | 247 | ||
| 249 | cFYI(1, "inode = 0x%p file flags are 0x%x for %s", | 248 | cFYI(1, "inode = 0x%p file flags are 0x%x for %s", |