diff options
author | Bryan Schumaker <bjschuma@netapp.com> | 2012-05-22 10:10:03 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-22 16:43:04 -0400 |
commit | 497826af60f812240ed5b6ba80541f7c9f2154d9 (patch) | |
tree | b741b4f133aa89a6c6e50bf1a1704f550e59cf9d /fs/nfs/nfs4filelayout.c | |
parent | bd4aeffb5b89070ae93c579f1d5a0758f7123e8b (diff) |
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: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4filelayout.c')
-rw-r--r-- | fs/nfs/nfs4filelayout.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 56aa0ec1b169..ddea4d3f598e 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c | |||
@@ -85,15 +85,14 @@ filelayout_get_dserver_offset(struct pnfs_layout_segment *lseg, loff_t offset) | |||
85 | static void filelayout_reset_write(struct nfs_write_data *data) | 85 | static void filelayout_reset_write(struct nfs_write_data *data) |
86 | { | 86 | { |
87 | struct nfs_pgio_header *hdr = data->header; | 87 | struct nfs_pgio_header *hdr = data->header; |
88 | struct inode *inode = hdr->inode; | ||
89 | struct rpc_task *task = &data->task; | 88 | struct rpc_task *task = &data->task; |
90 | 89 | ||
91 | if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) { | 90 | if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) { |
92 | dprintk("%s Reset task %5u for i/o through MDS " | 91 | dprintk("%s Reset task %5u for i/o through MDS " |
93 | "(req %s/%lld, %u bytes @ offset %llu)\n", __func__, | 92 | "(req %s/%lld, %u bytes @ offset %llu)\n", __func__, |
94 | data->task.tk_pid, | 93 | data->task.tk_pid, |
95 | inode->i_sb->s_id, | 94 | hdr->inode->i_sb->s_id, |
96 | (long long)NFS_FILEID(inode), | 95 | (long long)NFS_FILEID(hdr->inode), |
97 | data->args.count, | 96 | data->args.count, |
98 | (unsigned long long)data->args.offset); | 97 | (unsigned long long)data->args.offset); |
99 | 98 | ||
@@ -106,15 +105,14 @@ static void filelayout_reset_write(struct nfs_write_data *data) | |||
106 | static void filelayout_reset_read(struct nfs_read_data *data) | 105 | static void filelayout_reset_read(struct nfs_read_data *data) |
107 | { | 106 | { |
108 | struct nfs_pgio_header *hdr = data->header; | 107 | struct nfs_pgio_header *hdr = data->header; |
109 | struct inode *inode = hdr->inode; | ||
110 | struct rpc_task *task = &data->task; | 108 | struct rpc_task *task = &data->task; |
111 | 109 | ||
112 | if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) { | 110 | if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) { |
113 | dprintk("%s Reset task %5u for i/o through MDS " | 111 | dprintk("%s Reset task %5u for i/o through MDS " |
114 | "(req %s/%lld, %u bytes @ offset %llu)\n", __func__, | 112 | "(req %s/%lld, %u bytes @ offset %llu)\n", __func__, |
115 | data->task.tk_pid, | 113 | data->task.tk_pid, |
116 | inode->i_sb->s_id, | 114 | hdr->inode->i_sb->s_id, |
117 | (long long)NFS_FILEID(inode), | 115 | (long long)NFS_FILEID(hdr->inode), |
118 | data->args.count, | 116 | data->args.count, |
119 | (unsigned long long)data->args.offset); | 117 | (unsigned long long)data->args.offset); |
120 | 118 | ||