UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Fix bool initialization/comparison 

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

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Thomas Meyer 2017-10-07 16:02:21 +02:00 committed by Anna Schumaker
parent 3944369db7
commit 6089dd0d73
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/callback_proc.c
View File

@ -439,7 +439,7 @@ static bool referring_call_exists(struct nfs_client *clp,
uint32_t nrclists, uint32_t nrclists,
struct referring_call_list *rclists) struct referring_call_list *rclists)
{ {
bool status = 0; bool status = false;
int i, j; int i, j;
struct nfs4_session *session; struct nfs4_session *session;
struct nfs4_slot_table *tbl; struct nfs4_slot_table *tbl;

10
fs/nfs/dir.c
View File

@ -246,7 +246,7 @@ int nfs_readdir_search_for_pos(struct nfs_cache_array *array, nfs_readdir_descri
desc->cache_entry_index = index; desc->cache_entry_index = index;
return 0; return 0;
out_eof: out_eof:
desc->eof = 1; desc->eof = true;
return -EBADCOOKIE; 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) { if (array->eof_index >= 0) {
status = -EBADCOOKIE; status = -EBADCOOKIE;
if (*desc->dir_cookie == array->last_cookie) if (*desc->dir_cookie == array->last_cookie)
desc->eof = 1; desc->eof = true;
} }
out: out:
return status; return status;
@ -754,7 +754,7 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc)
ent = &array->array[i]; ent = &array->array[i];
if (!dir_emit(desc->ctx, ent->string.name, ent->string.len, if (!dir_emit(desc->ctx, ent->string.name, ent->string.len,
nfs_compat_user_ino64(ent->ino), ent->d_type)) { nfs_compat_user_ino64(ent->ino), ent->d_type)) {
desc->eof = 1; desc->eof = true;
break; break;
} }
desc->ctx->pos++; desc->ctx->pos++;
@ -766,7 +766,7 @@ int nfs_do_filldir(nfs_readdir_descriptor_t *desc)
ctx->duped = 1; ctx->duped = 1;
} }
if (array->eof_index >= 0) if (array->eof_index >= 0)
desc->eof = 1; desc->eof = true;
kunmap(desc->page); kunmap(desc->page);
cache_page_release(desc); cache_page_release(desc);
@ -866,7 +866,7 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx)
if (res == -EBADCOOKIE) { if (res == -EBADCOOKIE) {
res = 0; res = 0;
/* This means either end of directory */ /* 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 */ /* Or that the server has 'lost' a cookie */
res = uncached_readdir(desc); res = uncached_readdir(desc);
if (res == 0) if (res == 0)

2
fs/nfs/nfs4client.c
View File

@ -793,7 +793,7 @@ nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,
spin_lock(&nn->nfs_client_lock); spin_lock(&nn->nfs_client_lock);
list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) { 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; continue;
if (!nfs4_has_session(clp)) if (!nfs4_has_session(clp))

2
fs/nfs/pnfs.c
View File

@ -1513,7 +1513,7 @@ pnfs_lseg_range_match(const struct pnfs_layout_range *ls_range,
if ((range->iomode == IOMODE_RW && if ((range->iomode == IOMODE_RW &&
ls_range->iomode != IOMODE_RW) || ls_range->iomode != IOMODE_RW) ||
(range->iomode != ls_range->iomode && (range->iomode != ls_range->iomode &&
strict_iomode == true) || strict_iomode) ||
!pnfs_lseg_range_intersecting(ls_range, range)) !pnfs_lseg_range_intersecting(ls_range, range))
return 0; return 0;