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

Commit 6f00866d authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Fix more NFS debug related build warnings 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent ffa94db6

fs/nfs/blocklayout/blocklayout.c

+2 −3
Original line number Diff line number Diff line
@@ -233,12 +233,11 @@ bl_read_pagelist(struct nfs_read_data *rdata) 
	sector_t isect, extent_length = 0;

	struct parallel_io *par;

	loff_t f_offset = rdata->args.offset;

	size_t count = rdata->args.count;

	struct page **pages = rdata->args.pages;

	int pg_index = rdata->args.pgbase >> PAGE_CACHE_SHIFT;



	dprintk("%s enter nr_pages %u offset %lld count %Zd\n", __func__,

	       rdata->npages, f_offset, count);

	dprintk("%s enter nr_pages %u offset %lld count %u\n", __func__,

	       rdata->npages, f_offset, (unsigned int)rdata->args.count);



	par = alloc_parallel(rdata);

	if (!par)

fs/nfs/fscache.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ void nfs_fscache_reset_inode_cookie(struct inode *inode) 
{

	struct nfs_inode *nfsi = NFS_I(inode);

	struct nfs_server *nfss = NFS_SERVER(inode);

	struct fscache_cookie *old = nfsi->fscache;

	NFS_IFDEBUG(struct fscache_cookie *old = nfsi->fscache);



	nfs_fscache_inode_lock(inode);

	if (nfsi->fscache) {

fs/nfs/pnfs.h

+7 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ struct nfs4_deviceid_node { 
	atomic_t			ref;

};



void nfs4_print_deviceid(const struct nfs4_deviceid *dev_id);

struct nfs4_deviceid_node *nfs4_find_get_deviceid(const struct pnfs_layoutdriver_type *, const struct nfs_client *, const struct nfs4_deviceid *);

void nfs4_delete_deviceid(const struct pnfs_layoutdriver_type *, const struct nfs_client *, const struct nfs4_deviceid *);

void nfs4_init_deviceid_node(struct nfs4_deviceid_node *,
@@ -328,6 +327,13 @@ static inline int pnfs_return_layout(struct inode *ino) 
	return 0;

}



#ifdef NFS_DEBUG

void nfs4_print_deviceid(const struct nfs4_deviceid *dev_id);

#else

static inline void nfs4_print_deviceid(const struct nfs4_deviceid *dev_id)

{

}

#endif /* NFS_DEBUG */

#else  /* CONFIG_NFS_V4_1 */



static inline void pnfs_destroy_all_layouts(struct nfs_client *clp)

fs/nfs/pnfs_dev.c

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
static struct hlist_head nfs4_deviceid_cache[NFS4_DEVICE_ID_HASH_SIZE];

static DEFINE_SPINLOCK(nfs4_deviceid_lock);



#ifdef NFS_DEBUG

void

nfs4_print_deviceid(const struct nfs4_deviceid *id)

{
@@ -52,6 +53,7 @@ nfs4_print_deviceid(const struct nfs4_deviceid *id) 
		p[0], p[1], p[2], p[3]);

}

EXPORT_SYMBOL_GPL(nfs4_print_deviceid);

#endif



static inline u32

nfs4_deviceid_hash(const struct nfs4_deviceid *id)

include/linux/nfs_fs.h

+2 −0
Original line number Diff line number Diff line
@@ -661,8 +661,10 @@ nfs_fileid_to_ino_t(u64 fileid) 
# undef ifdebug

# ifdef NFS_DEBUG

#  define ifdebug(fac)		if (unlikely(nfs_debug & NFSDBG_##fac))

#  define NFS_IFDEBUG(x)	x

# else

#  define ifdebug(fac)		if (0)

#  define NFS_IFDEBUG(x)

# endif

#endif /* __KERNEL */