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

Commit 1dc8548c authored Jul 05, 2013 by Laurent Navet Committed by Greg Kroah-Hartman Jul 23, 2013

staging: lustre: use ERR_CAST() function



use ERR_CAST() function instead of ERR_PTR() and PTR_ERR()
found using coccinelle and err_cast.cocci

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c4f39553

drivers/staging/lustre/lustre/llite/llite_nfs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ ll_iget_for_nfs(struct super_block sb, struct lu_fid fid, struct lu_fid *paren

		inode = search_inode_for_lustre(sb, fid);
		if (IS_ERR(inode))
		RETURN(ERR_PTR(PTR_ERR(inode)));
		RETURN(ERR_CAST(inode));

		if (is_bad_inode(inode)) {
		/* we didn't find the right inode.. */

drivers/staging/lustre/lustre/llite/rw.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ static struct ll_cl_context ll_cl_init(struct file file,

		env = cl_env_get(&refcheck);
		if (IS_ERR(env))
		return ERR_PTR(PTR_ERR(env));
		return ERR_CAST(env);

		lcc = &vvp_env_info(env)->vti_io_ctx;
		memset(lcc, 0, sizeof(*lcc));

drivers/staging/lustre/lustre/obdclass/local_storage.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -443,7 +443,7 @@ struct dt_object local_file_find_or_create_with_fid(const struct lu_env env,

		ls = ls_device_get(dt);
		if (IS_ERR(ls)) {
		dto = ERR_PTR(PTR_ERR(ls));
		dto = ERR_CAST(ls);
		} else {
		/* create the object */
		dti->dti_attr.la_valid = LA_MODE;
		@@ -537,7 +537,7 @@ local_index_find_or_create_with_fid(const struct lu_env *env,

		ls = ls_device_get(dt);
		if (IS_ERR(ls)) {
		dto = ERR_PTR(PTR_ERR(ls));
		dto = ERR_CAST(ls);
		} else {
		/* create the object */
		dti->dti_attr.la_valid = LA_MODE;