diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-11 05:52:49 +0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-11 05:52:49 +0800 |
commit | e9bd8f1624cb0f647867d6cced79cb26ef3651bf (patch) | |
tree | 89d9d7b02644823d54a6b244aeb89d46028c5eac /fs/cifs/file.c | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs (diff) | |
parent | CIFS: Fix endianness conversion (diff) | |
download | linux-dev-e9bd8f1624cb0f647867d6cced79cb26ef3651bf.tar.xz linux-dev-e9bd8f1624cb0f647867d6cced79cb26ef3651bf.zip |
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French.
* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
CIFS: Fix endianness conversion
CIFS: Fix error handling in cifs_push_mandatory_locks
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r-- | fs/cifs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 9154192b0683..71e9ad9f5961 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -917,7 +917,7 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile) if (!buf) { mutex_unlock(&cinode->lock_mutex); free_xid(xid); - return rc; + return -ENOMEM; } for (i = 0; i < 2; i++) { |