2015-04-13 22:06:39

by Sergei Zviagintsev

Subject: [PATCH] nfs: Fix unused variable build warning when CONFIG_SUNRPC_DEBUG is not set

Commit f52cbe4c9838 ("nfs: generic_write_checks() shouldn't be done on
swapout...") caused unused variable build warning in fs/nfs/file.c
when CONFIG_SUNRPC_DEBUG is not set as pos variable is used only in
dprintk() call. Fix it.

Signed-off-by: Sergei Zviagintsev <[email protected]>
Fixes: f52cbe4c9838 ("nfs: generic_write_checks() shouldn't be done on swapout...")
---
fs/nfs/file.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 031ddcb1061d..c40e4363e746 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -674,7 +674,6 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
unsigned long written = 0;
ssize_t result;
size_t count = iov_iter_count(from);
- loff_t pos = iocb->ki_pos;

result = nfs_key_timeout_notify(file, inode);
if (result)
@@ -688,7 +687,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
}

dprintk("NFS: write(%pD2, %zu@%Ld)\n",
- file, count, (long long) pos);
+ file, count, (long long) iocb->ki_pos);

result = -EBUSY;
if (IS_SWAPFILE(inode))
--
1.8.3.1

2015-04-14 19:19:33

by Paul Bolle

Subject: Re: [PATCH] nfs: Fix unused variable build warning when CONFIG_SUNRPC_DEBUG is not set

On Tue, 2015-04-14 at 01:06 +0300, Sergei Zviagintsev wrote:
> Commit f52cbe4c9838 ("nfs: generic_write_checks() shouldn't be done on
> swapout...") caused unused variable build warning in fs/nfs/file.c
> when CONFIG_SUNRPC_DEBUG is not set as pos variable is used only in
> dprintk() call. Fix it.

Would that warning be:
fs/nfs/file.c: In function ‘nfs_file_write’:
fs/nfs/file.c:677:9: warning: unused variable ‘pos’ [-Wunused-variable]
loff_t pos = iocb->ki_pos;
^

Please add the warning you fix in the commit explanation. Doing that
might save other people the trouble of doing the work you already did.
Because then basically all they need to do is a web search or a "git log
--grep" for (parts of) that messages.

> Signed-off-by: Sergei Zviagintsev <[email protected]>
> Fixes: f52cbe4c9838 ("nfs: generic_write_checks() shouldn't be done on swapout...")
> ---
> fs/nfs/file.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/nfs/file.c b/fs/nfs/file.c
> index 031ddcb1061d..c40e4363e746 100644
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@ -674,7 +674,6 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
> unsigned long written = 0;
> ssize_t result;
> size_t count = iov_iter_count(from);
> - loff_t pos = iocb->ki_pos;
>
> result = nfs_key_timeout_notify(file, inode);
> if (result)
> @@ -688,7 +687,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
> }
>
> dprintk("NFS: write(%pD2, %zu@%Ld)\n",
> - file, count, (long long) pos);
> + file, count, (long long) iocb->ki_pos);
>
> result = -EBUSY;
> if (IS_SWAPFILE(inode))

Thanks,


Paul Bolle

2015-04-15 21:06:16

by Sergei Zviagintsev

Subject: Re: [PATCH] nfs: Fix unused variable build warning when CONFIG_SUNRPC_DEBUG is not set

Hi Paul,

On Tue, Apr 14, 2015 at 09:19:29PM +0200, Paul Bolle wrote:
> On Tue, 2015-04-14 at 01:06 +0300, Sergei Zviagintsev wrote:
> > Commit f52cbe4c9838 ("nfs: generic_write_checks() shouldn't be done on
> > swapout...") caused unused variable build warning in fs/nfs/file.c
> > when CONFIG_SUNRPC_DEBUG is not set as pos variable is used only in
> > dprintk() call. Fix it.
>
> Would that warning be:
> fs/nfs/file.c: In function ‘nfs_file_write’:
> fs/nfs/file.c:677:9: warning: unused variable ‘pos’ [-Wunused-variable]
> loff_t pos = iocb->ki_pos;
> ^
>
> Please add the warning you fix in the commit explanation. Doing that
> might save other people the trouble of doing the work you already did.
> Because then basically all they need to do is a web search or a "git log
> --grep" for (parts of) that messages.

Thank you for advice, I missed that. However I see that this warning is
fixed already in Al Viro's vfs repo, so this patch is irrelevant.