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]>
---
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 2219c88..e528e5c 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -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)) {
On Mon, Oct 31, 2011 at 9:18 PM, Trond Myklebust
<[email protected]> wrote:
> 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.
> 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]>
---
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 2219c88..a2e4b27 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -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;
}
On Tue, 2011-11-01 at 00:16 +0600, Rakib Mullick wrote:
> On Mon, Oct 31, 2011 at 11:43 PM, Trond Myklebust
> <[email protected]> wrote:
> > On Mon, 2011-10-31 at 23:12 +0600, Rakib Mullick wrote:
> >> On Mon, Oct 31, 2011 at 9:18 PM, Trond Myklebust
> >> <[email protected]> wrote:
> >> > 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?
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
--
Trond Myklebust
Linux NFS client maintainer
NetApp
[email protected]
http://www.netapp.com
On Mon, 2011-10-31 at 23:12 +0600, Rakib Mullick wrote:
> On Mon, Oct 31, 2011 at 9:18 PM, Trond Myklebust
> <[email protected]> wrote:
> > 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.
>
> > 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]>
> ---
>
> diff --git a/fs/nfs/write.c b/fs/nfs/write.c
> index 2219c88..a2e4b27 100644
> --- a/fs/nfs/write.c
> +++ b/fs/nfs/write.c
> @@ -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,
^^^^^^^^^^^^
NFS_SERVER(data->inode)->nfs_client....
> resp->verf->committed, argp->stable);
> complain = jiffies + 300 * HZ;
> }
--
Trond Myklebust
Linux NFS client maintainer
NetApp
[email protected]
http://www.netapp.com
On Mon, Oct 31, 2011 at 11:43 PM, Trond Myklebust
<[email protected]> wrote:
> On Mon, 2011-10-31 at 23:12 +0600, Rakib Mullick wrote:
>> On Mon, Oct 31, 2011 at 9:18 PM, Trond Myklebust
>> <[email protected]> wrote:
>> > 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
On Fri, 2011-10-28 at 16:36 +0600, Rakib Mullick wrote:
> 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]>
> ---
>
> diff --git a/fs/nfs/write.c b/fs/nfs/write.c
> index 2219c88..e528e5c 100644
> --- a/fs/nfs/write.c
> +++ b/fs/nfs/write.c
> @@ -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)) {
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()...
--
Trond Myklebust
Linux NFS client maintainer
NetApp
[email protected]
http://www.netapp.com