Skip to content

Commit

Permalink
NFS: Fix compiler warnings
Browse files Browse the repository at this point in the history
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: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Bryan Schumaker authored and Trond Myklebust committed May 22, 2012
1 parent bd4aeff commit 497826a
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions fs/nfs/nfs4filelayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand Down

0 comments on commit 497826a

Please sign in to comment.