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

Commit a7a3b1e9 authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Anna Schumaker
Browse files

NFS: convert flags to bool 



NFS uses some int, and unsigned int :1, and bool as flags in structs and
args.  Assert the preference for uniformly replacing these with the bool
type.

Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 18fe6a23

fs/nfs/dir.c

+8 −8
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct nfs_cache_array { 
	struct nfs_cache_array_entry array[0];

};



typedef int (*decode_dirent_t)(struct xdr_stream *, struct nfs_entry *, int);

typedef int (*decode_dirent_t)(struct xdr_stream *, struct nfs_entry *, bool);

typedef struct {

	struct file	*file;

	struct page	*page;
@@ -165,8 +165,8 @@ typedef struct { 
	unsigned long	timestamp;

	unsigned long	gencount;

	unsigned int	cache_entry_index;

	unsigned int	plus:1;

	unsigned int	eof:1;

	bool plus;

	bool eof;

} nfs_readdir_descriptor_t;



/*
@@ -355,7 +355,7 @@ int nfs_readdir_xdr_filler(struct page **pages, nfs_readdir_descriptor_t *desc, 
		if (error == -ENOTSUPP && desc->plus) {

			NFS_SERVER(inode)->caps &= ~NFS_CAP_READDIRPLUS;

			clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);

			desc->plus = 0;

			desc->plus = false;

			goto again;

		}

		goto error;
@@ -557,7 +557,7 @@ int nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct nfs_entry *en 


		count++;



		if (desc->plus != 0)

		if (desc->plus)

			nfs_prime_dcache(file_dentry(desc->file), entry);



		status = nfs_readdir_add_to_array(entry, page);
@@ -860,7 +860,7 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx) 
	desc->ctx = ctx;

	desc->dir_cookie = &dir_ctx->dir_cookie;

	desc->decode = NFS_PROTO(inode)->decode_dirent;

	desc->plus = nfs_use_readdirplus(inode, ctx) ? 1 : 0;

	desc->plus = nfs_use_readdirplus(inode, ctx);



	if (ctx->pos == 0 || nfs_attribute_cache_expired(inode))

		res = nfs_revalidate_mapping(inode, file->f_mapping);
@@ -885,8 +885,8 @@ static int nfs_readdir(struct file *file, struct dir_context *ctx) 
			clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);

			nfs_zap_caches(inode);

			desc->page_index = 0;

			desc->plus = 0;

			desc->eof = 0;

			desc->plus = false;

			desc->eof = false;

			continue;

		}

		if (res < 0)

fs/nfs/internal.h

+3 −3
Original line number Diff line number Diff line
@@ -272,17 +272,17 @@ static inline bool nfs_match_open_context(const struct nfs_open_context *ctx1, 
/* nfs2xdr.c */

extern const struct rpc_procinfo nfs_procedures[];

extern int nfs2_decode_dirent(struct xdr_stream *,

				struct nfs_entry *, int);

				struct nfs_entry *, bool);



/* nfs3xdr.c */

extern const struct rpc_procinfo nfs3_procedures[];

extern int nfs3_decode_dirent(struct xdr_stream *,

				struct nfs_entry *, int);

				struct nfs_entry *, bool);



/* nfs4xdr.c */

#if IS_ENABLED(CONFIG_NFS_V4)

extern int nfs4_decode_dirent(struct xdr_stream *,

				struct nfs_entry *, int);

				struct nfs_entry *, bool);

#endif

#ifdef CONFIG_NFS_V4_1

extern const u32 nfs41_maxread_overhead;

fs/nfs/nfs2xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ static int nfs2_xdr_dec_writeres(struct rpc_rqst *req, struct xdr_stream *xdr, 
 *	};

 */

int nfs2_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,

		       int plus)

		       bool plus)

{

	__be32 *p;

	int error;

fs/nfs/nfs3proc.c

+1 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ nfs3_proc_rmdir(struct inode *dir, const struct qstr *name) 
 */

static int

nfs3_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,

		  u64 cookie, struct page **pages, unsigned int count, int plus)

		  u64 cookie, struct page **pages, unsigned int count, bool plus)

{

	struct inode		*dir = d_inode(dentry);

	__be32			*verf = NFS_I(dir)->cookieverf;

fs/nfs/nfs3xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -1991,7 +1991,7 @@ static int nfs3_xdr_dec_link3res(struct rpc_rqst *req, struct xdr_stream *xdr, 
 *	};

 */

int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,

		       int plus)

		       bool plus)

{

	struct nfs_entry old = *entry;

	__be32 *p;