Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7acd337 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging/lustre/clio: reorder initialization in cl_req_alloc() 



In cl_req_alloc() ensure that the list heads crq_pages and crq_layers
have been initialized before passing the request to
cl_req_completion(). This fixes an oops in the error path.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-on: http://review.whamcloud.com/11009
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5290


Reviewed-by: default avatarBobi Jam <bobijam@gmail.com>
Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f261f48a

drivers/staging/lustre/lustre/obdclass/cl_io.c

+4 −3
Original line number Diff line number Diff line
@@ -1452,12 +1452,13 @@ struct cl_req *cl_req_alloc(const struct lu_env *env, struct cl_page *page, 
	if (req != NULL) {

		int result;



		OBD_ALLOC(req->crq_o, nr_objects * sizeof(req->crq_o[0]));

		if (req->crq_o != NULL) {

			req->crq_nrobjs = nr_objects;

		req->crq_type = crt;

		INIT_LIST_HEAD(&req->crq_pages);

		INIT_LIST_HEAD(&req->crq_layers);



		OBD_ALLOC(req->crq_o, nr_objects * sizeof(req->crq_o[0]));

		if (req->crq_o != NULL) {

			req->crq_nrobjs = nr_objects;

			result = cl_req_init(env, req, page);

		} else

			result = -ENOMEM;