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

Commit 30889c72 authored by Bobi Jam's avatar Bobi Jam Committed by Greg Kroah-Hartman
Browse files

staging/lustre: lov_io_init() should return error code 



lov_io_init_empty/release() should returns error code instead of
true on error case.

Fault IO needs to handle restart in the case of accessing HSM released
file

Signed-off-by: default avatarBobi Jam <bobijam.xu@intel.com>
Reviewed-on: http://review.whamcloud.com/17240
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7446


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6cead36d

drivers/staging/lustre/lustre/llite/llite_mmap.c

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ ll_fault_io_init(struct vm_area_struct *vma, struct lu_env **env_ret, 


	*env_ret = env;



restart:

	io = vvp_env_thread_io(env);

	io->ci_obj = ll_i2info(inode)->lli_clob;

	LASSERT(io->ci_obj);
@@ -157,6 +158,9 @@ ll_fault_io_init(struct vm_area_struct *vma, struct lu_env **env_ret, 
	} else {

		LASSERT(rc < 0);

		cl_io_fini(env, io);

		if (io->ci_need_restart)

			goto restart;



		cl_env_nested_put(nest, env);

		io = ERR_PTR(rc);

	}

drivers/staging/lustre/lustre/lov/lov_io.c

+2 −2
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ int lov_io_init_empty(const struct lu_env *env, struct cl_object *obj, 
	}



	io->ci_result = result < 0 ? result : 0;

	return result != 0;

	return result;

}



int lov_io_init_released(const struct lu_env *env, struct cl_object *obj,
@@ -959,7 +959,7 @@ int lov_io_init_released(const struct lu_env *env, struct cl_object *obj, 
	}



	io->ci_result = result < 0 ? result : 0;

	return result != 0;

	return result;

}



/** @} lov */

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

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ void cl_io_fini(const struct lu_env *env, struct cl_io *io) 
	case CIT_WRITE:

		break;

	case CIT_FAULT:

		break;

	case CIT_FSYNC:

		LASSERT(!io->ci_need_restart);

		break;