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

Commit 497826af authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Fix compiler warnings 



The "struct inode *inode" was only used in a dprintk, so compiling with
CONFIG_SUNRPC_DEBUG off triggers a warning.  To get around this, I
remove the "struct inode *inode" variable and instead change the
dprintk()s to use hdr->inode instead.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent bd4aeffb

fs/nfs/nfs4filelayout.c

+4 −6
Original line number Diff line number Diff line
@@ -85,15 +85,14 @@ filelayout_get_dserver_offset(struct pnfs_layout_segment *lseg, loff_t offset) 
static void filelayout_reset_write(struct nfs_write_data *data)

{

	struct nfs_pgio_header *hdr = data->header;

	struct inode *inode = hdr->inode;

	struct rpc_task *task = &data->task;



	if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) {

		dprintk("%s Reset task %5u for i/o through MDS "

			"(req %s/%lld, %u bytes @ offset %llu)\n", __func__,

			data->task.tk_pid,

			inode->i_sb->s_id,

			(long long)NFS_FILEID(inode),

			hdr->inode->i_sb->s_id,

			(long long)NFS_FILEID(hdr->inode),

			data->args.count,

			(unsigned long long)data->args.offset);
@@ -106,15 +105,14 @@ static void filelayout_reset_write(struct nfs_write_data *data) 
static void filelayout_reset_read(struct nfs_read_data *data)

{

	struct nfs_pgio_header *hdr = data->header;

	struct inode *inode = hdr->inode;

	struct rpc_task *task = &data->task;



	if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) {

		dprintk("%s Reset task %5u for i/o through MDS "

			"(req %s/%lld, %u bytes @ offset %llu)\n", __func__,

			data->task.tk_pid,

			inode->i_sb->s_id,

			(long long)NFS_FILEID(inode),

			hdr->inode->i_sb->s_id,

			(long long)NFS_FILEID(hdr->inode),

			data->args.count,

			(unsigned long long)data->args.offset);