nfs: Fix unused variable warning.

PATCH In review Rakib Mullick 2 participants 6 messages Oct 28, 2011 – Oct 31, 2011

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Rakib Mullick

author

2011-10-28 10:36 UTC #0 lore raw

PATCH 1/1 nfs: Fix unused variable warning.

When CONFIG_NFS=y, but CONFIG_NFS_V3_{,V4}=n we get the following warning:

fs/nfs/write.c: In function ‘nfs_writeback_done’:
fs/nfs/write.c:1246:21: warning: unused variable ‘server’

This patch fixes it.

Signed-off-by Rakib Mullick <[email protected]>

---

fs/nfs/write.c +2 -1

index 2219c88..e528e5c 100644
@@ -1243,7 +1243,6 @@ void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
 {
 	struct nfs_writeargs	*argp = &data->args;
 	struct nfs_writeres	*resp = &data->res;
-	struct nfs_server	*server = NFS_SERVER(data->inode);
 	int status;
 
 	dprintk("NFS: %5u nfs_writeback_done (status %d)\n",

@@ -1272,6 +1271,8 @@ void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
 		 *	 as a dprintk() in order to avoid filling syslog.
 		 */
 		static unsigned long    complain;
+		struct nfs_server	*server;
+		server = NFS_SERVER(data->inode);
 
 		/* Note this will print the MDS for a DS write */
 		if (time_before(complain, jiffies)) {

Trond Myklebust

2011-10-31 15:18 UTC #1 lore raw

Quoted 23 lines · Rakib Mullick

When CONFIG_NFS=y, but CONFIG_NFS_V3_{,V4}=n we get the following warning:
fs/nfs/write.c: In function ‘nfs_writeback_done’:
fs/nfs/write.c:1246:21: warning: unused variable ‘server’
This patch fixes it.
Signed-off-by Rakib Mullick <[email protected]>
---
fs/nfs/write.c +0 -1
index 2219c88..e528e5c 100644
@@ -1243,7 +1243,6 @@ void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
 {
 	struct nfs_writeargs	*argp = &data->args;
 	struct nfs_writeres	*resp = &data->res;
-	struct nfs_server	*server = NFS_SERVER(data->inode);
 	int status;
 
 	dprintk("NFS: %5u nfs_writeback_done (status %d)\n",

fs/nfs/write.c void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data) · line 1278

Quoted 8 lines

fs/nfs/write.c +2 -0

@@ -1272,6 +1271,8 @@ void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
 		 *	 as a dprintk() in order to avoid filling syslog.
 		 */
 		static unsigned long    complain;
+		struct nfs_server	*server;
+		server = NFS_SERVER(data->inode);
 
 		/* Note this will print the MDS for a DS write */
 		if (time_before(complain, jiffies)) {

This will still cause a warning if you compile without RPC_DEBUG (e.g. if CONFIG_SYSCTL isn't defined).

Since there is only one user, it seems better to just open-code the NFS_SERVER(data->inode) in the dprintk()...

Signature · 6 lines

Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com

Rakib Mullick

author

2011-10-31 17:12 UTC #2 lore raw

Quoted 5 lines · Trond Myklebust

On Fri, 2011-10-28 at 16:36 +0600, Rakib Mullick wrote:
This will still cause a warning if you compile without RPC_DEBUG (e.g. if CONFIG_SYSCTL isn't defined).

I didn't get any warning with CONFIG_SYSCTL=n.

Quoted 2 lines

Since there is only one user, it seems better to just open-code the NFS_SERVER(data->inode) in the dprintk()...

Okay, it seems reasonable. We can simply remove 'server'. Please consider the following patch (also attached, might have some white space issue).

---

When CONFIG_NFS=y and CONFIG_NFS_V3_{,V4}=n we get the following warning.

fs/nfs/write.c: In function ‘nfs_writeback_done’:
fs/nfs/write.c:1246:21: warning: unused variable ‘server’

Remove the variable 'server' to fix the above warning.

Signed-off-by Rakib Mullick <[email protected]>

---

fs/nfs/write.c +0 -0

index 2219c88..a2e4b27 100644
@@ -1243,7 +1243,6 @@ void nfs_writeback_done(struct rpc_task *task,

struct nfs_write_data *data)
{
struct nfs_writeargs *argp = &data->args;
struct nfs_writeres *resp = &data->res;
- struct nfs_server *server = NFS_SERVER(data->inode);
int status;

dprintk("NFS: %5u nfs_writeback_done (status %d)\n",
@@ -1277,7 +1276,7 @@ void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
if (time_before(complain, jiffies)) {
dprintk("NFS: faulty NFS server %s:"
" (committed = %d) != (stable = %d)\n",
- server->nfs_client->cl_hostname,
+ data->inode->nfs_client->cl_hostname,
resp->verf->committed, argp->stable);
complain = jiffies + 300 * HZ;
}

When CONFIG_NFS=y and CONFIG_NFS_V3_{,V4}=n we get the following warning.

fs/nfs/write.c: In function ‘nfs_writeback_done’:
fs/nfs/write.c:1246:21: warning: unused variable ‘server’

Remove the variable 'server' to fix the above warning.

Signed-off-by Rakib Mullick <[email protected]>

---

fs/nfs/write.c +1 -2

index 2219c88..a2e4b27 100644
@@ -1243,7 +1243,6 @@ void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
 {
 	struct nfs_writeargs	*argp = &data->args;
 	struct nfs_writeres	*resp = &data->res;
-	struct nfs_server	*server = NFS_SERVER(data->inode);
 	int status;
 
 	dprintk("NFS: %5u nfs_writeback_done (status %d)\n",

@@ -1277,7 +1276,7 @@ void nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
 		if (time_before(complain, jiffies)) {
 			dprintk("NFS:       faulty NFS server %s:"
 				" (committed = %d) != (stable = %d)\n",
-				server->nfs_client->cl_hostname,
+				data->inode->nfs_client->cl_hostname,
 				resp->verf->committed, argp->stable);
 			complain = jiffies + 300 * HZ;
 		}

Trond Myklebust

2011-10-31 17:43 UTC #3 lore raw

Quoted 42 lines · Rakib Mullick

Quoted 5 lines · Trond Myklebust
On Fri, 2011-10-28 at 16:36 +0600, Rakib Mullick wrote:
This will still cause a warning if you compile without RPC_DEBUG (e.g. if CONFIG_SYSCTL isn't defined).
I didn't get any warning with CONFIG_SYSCTL=n.
Quoted 2 lines
Since there is only one user, it seems better to just open-code the NFS_SERVER(data->inode) in the dprintk()...
Okay, it seems reasonable. We can simply remove 'server'. Please consider the following patch (also attached, might have some white space issue).
---
When CONFIG_NFS=y and CONFIG_NFS_V3_{,V4}=n we get the following warning.
fs/nfs/write.c: In function ‘nfs_writeback_done’:
fs/nfs/write.c:1246:21: warning: unused variable ‘server’
Remove the variable 'server' to fix the above warning.
Signed-off-by Rakib Mullick <[email protected]>
---
fs/nfs/write.c +0 -1
index 2219c88..a2e4b27 100644
@@ -1243,7 +1243,6 @@ void nfs_writeback_done(struct rpc_task *task,
 struct nfs_write_data *data)
 {
 	struct nfs_writeargs	*argp = &data->args;
 	struct nfs_writeres	*resp = &data->res;
-	struct nfs_server	*server = NFS_SERVER(data->inode);
 	int status;
 
fs/nfs/write.c +0 -0
 	dprintk("NFS: %5u nfs_writeback_done (status %d)\n",

fs/nfs/write.c void nfs_writeback_done(struct rpc_task *task, · line 1280

Quoted 6 lines

fs/nfs/write.c +1 -1

@@ -1277,7 +1276,7 @@ void nfs_writeback_done(struct rpc_task *task,
 struct nfs_write_data *data)
 		if (time_before(complain, jiffies)) {
 			dprintk("NFS:       faulty NFS server %s:"
 				" (committed = %d) != (stable = %d)\n",
-				server->nfs_client->cl_hostname,
+				data->inode->nfs_client->cl_hostname,

				 ^^^^^^^^^^^^

NFS_SERVER(data->inode)->nfs_client....

Quoted 3 lines

fs/nfs/write.c +0 -0

 				resp->verf->committed, argp->stable);
 			complain = jiffies + 300 * HZ;

}

Signature · 6 lines

Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com

Rakib Mullick

author

2011-10-31 18:16 UTC #4 lore raw

Quoted 7 lines · Trond Myklebust

Quoted 4 lines · Rakib Mullick
Quoted 1 line · Trond Myklebust
On Fri, 2011-10-28 at 16:36 +0600, Rakib Mullick wrote:
+ data->inode->nfs_client->cl_hostname,
^^^^^^^^^^^^
NFS_SERVER(data->inode)->nfs_client....

Opss. Sorry, should've more careful, rather doing it quickly :(. data->inode has nothing inside named nfs_client, but didn't even complain. I'll resend it.

Anyway, I found the two following warning in nfs/file.c

fs/nfs/file.c: In function ‘nfs_file_release’:
fs/nfs/file.c:140:17: warning: unused variable ‘dentry’ fs/nfs/file.c: In function ‘nfs_file_read’:
fs/nfs/file.c:237:9: warning: unused variable ‘count’

I'm wanting to send one patch to cleanup all these unused variable issues. Shall I? Or, should I send separate patches?

Thanks,
Rakib

Trond Myklebust

2011-10-31 18:28 UTC #5 lore raw

Quoted 16 lines · Rakib Mullick

Quoted 7 lines · Trond Myklebust
Quoted 4 lines · Rakib Mullick
Quoted 1 line · Trond Myklebust
On Fri, 2011-10-28 at 16:36 +0600, Rakib Mullick wrote:
+ data->inode->nfs_client->cl_hostname,
                                ^^^^^^^^^^^^
NFS_SERVER(data->inode)->nfs_client....
Opss. Sorry, should've more careful, rather doing it quickly :(. data->inode has nothing inside named nfs_client, but didn't even complain. I'll resend it.
Anyway, I found the two following warning in nfs/file.c

Quoted 7 lines

fs/nfs/file.c: In function ‘nfs_file_release’:
fs/nfs/file.c:140:17: warning: unused variable ‘dentry’ fs/nfs/file.c: In function ‘nfs_file_read’:
fs/nfs/file.c:237:9: warning: unused variable ‘count’
I'm wanting to send one patch to cleanup all these unused variable issues. Shall I? Or, should I send separate patches?

Please send 2 patches: the stuff in fs/nfs/file.c looks as if it predates the linux-3.1 release, and so we might want to keep those fixes in a separate patch.

Cheers
Trond

Signature · 6 lines

Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com