diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-31 12:36:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-31 12:36:39 -0800 |
| commit | 415f9b71d17d294c2f2075b3fc7717d72e5e48f9 (patch) | |
| tree | 2baf33529d5de478b2501b7fa155d4cc95d35627 /fs | |
| parent | f9a42e0d58cf0fe3d902e63d4582f2ea4cd2bb8b (diff) | |
| parent | 81ddd8c0c5e1cb41184d66567140cb48c53eb3d1 (diff) | |
| download | blackbird-obmc-linux-415f9b71d17d294c2f2075b3fc7717d72e5e48f9.tar.gz blackbird-obmc-linux-415f9b71d17d294c2f2075b3fc7717d72e5e48f9.zip | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fix from Steve French:
"A small cifs fix for stable"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
cifs: initialize file_info_lock
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/readdir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 8f6a2a5863b9..a27fc8791551 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -285,6 +285,7 @@ initiate_cifs_search(const unsigned int xid, struct file *file) rc = -ENOMEM; goto error_exit; } + spin_lock_init(&cifsFile->file_info_lock); file->private_data = cifsFile; cifsFile->tlink = cifs_get_tlink(tlink); tcon = tlink_tcon(tlink); |
