diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-20 13:51:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-20 13:51:21 +0800 |
| commit | 663276faa26c2837eca83a5800b3668be19aaaff (patch) | |
| tree | aee6a1964c83eb2153bde4a4c442af88204a28a8 /fs/cifs | |
| parent | 667ea3959654ae48ef303df13f2635fd07766cb4 (diff) | |
| parent | 5c43c539346972b9a1d5f38dc62db5a39997488d (diff) | |
Merge tag 'v3.14.39' into linux-linaro-lsk-v3.14
This is the 3.14.39 stable release
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/file.c | 1 | ||||
| -rw-r--r-- | fs/cifs/smb2ops.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 0218a9b23b38..40ddb6e93912 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1821,6 +1821,7 @@ refind_writable: cifsFileInfo_put(inv_file); spin_lock(&cifs_file_list_lock); ++refind; + inv_file = NULL; goto refind_writable; } } diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 34a17d425be6..30f3eb5bc022 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -630,7 +630,8 @@ smb2_clone_range(const unsigned int xid, /* No need to change MaxChunks since already set to 1 */ chunk_sizes_updated = true; - } + } else + goto cchunk_out; } cchunk_out: |