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

Commit 6089dd0d authored by Thomas Meyer's avatar Thomas Meyer Committed by Anna Schumaker
Browse files

NFS: Fix bool initialization/comparison 



Bool initializations should use true and false. Bool tests don't need
comparisons.

Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 3944369d

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static bool referring_call_exists(struct nfs_client *clp, 
				  uint32_t nrclists,

				  struct referring_call_list *rclists)

{

	bool status = 0;

	bool status = false;

	int i, j;

	struct nfs4_session *session;

	struct nfs4_slot_table *tbl;

fs/nfs/dir.c

+5 −5
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ int nfs_readdir_search_for_pos(struct nfs_cache_array *array, nfs_readdir_descri 
	desc->cache_entry_index = index;

	return 0;

out_eof:

	desc->eof = 1;

	desc->eof = true;

	return -EBADCOOKIE;

}
@@ -300,7 +300,7 @@ int nfs_readdir_search_for_cookie(struct nfs_cache_array *array, nfs_readdir_des 
	if (array->eof_index >= 0) {

		status = -EBADCOOKIE;

		if (*desc->dir_cookie == array->last_cookie)

			desc->eof = 1;

			desc->eof = true;

	}

out:

	return status;
@@ -754,7 +754,7 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc) 
		ent = &array->array[i];

		if (!dir_emit(desc->ctx, ent->string.name, ent->string.len,

		    nfs_compat_user_ino64(ent->ino), ent->d_type)) {

			desc->eof = 1;

			desc->eof = true;

			break;

		}

		desc->ctx->pos++;
@@ -766,7 +766,7 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc) 
			ctx->duped = 1;

	}

	if (array->eof_index >= 0)

		desc->eof = 1;

		desc->eof = true;



	kunmap(desc->page);

	cache_page_release(desc);
@@ -866,7 +866,7 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx) 
		if (res == -EBADCOOKIE) {

			res = 0;

			/* This means either end of directory */

			if (*desc->dir_cookie && desc->eof == 0) {

			if (*desc->dir_cookie && !desc->eof) {

				/* Or that the server has 'lost' a cookie */

				res = uncached_readdir(desc);

				if (res == 0)

fs/nfs/nfs4client.c

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr, 


	spin_lock(&nn->nfs_client_lock);

	list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) {

		if (nfs4_cb_match_client(addr, clp, minorversion) == false)

		if (!nfs4_cb_match_client(addr, clp, minorversion))

			continue;



		if (!nfs4_has_session(clp))

fs/nfs/pnfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1513,7 +1513,7 @@ pnfs_lseg_range_match(const struct pnfs_layout_range *ls_range, 
	if ((range->iomode == IOMODE_RW &&

	     ls_range->iomode != IOMODE_RW) ||

	    (range->iomode != ls_range->iomode &&

	     strict_iomode == true) ||

	     strict_iomode) ||

	    !pnfs_lseg_range_intersecting(ls_range, range))

		return 0;