Commit 415f9b71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f9a42e0d 81ddd8c0

fs/cifs/readdir.c

+1 −0
Original line number Diff line number Diff line
@@ -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);