2014-07-12 21:37:49

by Trond Myklebust

Subject: [PATCH] NFS: Remove 2 unused variables

Cc: Weston Andros Adamson <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
---
fs/nfs/direct.c | 2 --
fs/nfs/write.c | 2 --
2 files changed, 4 deletions(-)

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 8f98138cbc43..f11b9eed0de1 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -756,7 +756,6 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
spin_unlock(&dreq->lock);

while (!list_empty(&hdr->pages)) {
- bool do_destroy = true;

req = nfs_list_entry(hdr->pages.next);
nfs_list_remove_request(req);
@@ -765,7 +764,6 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
case NFS_IOHDR_NEED_COMMIT:
kref_get(&req->wb_kref);
nfs_mark_request_commit(req, hdr->lseg, &cinfo);
- do_destroy = false;
}
nfs_unlock_and_release_request(req);
}
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index bdc4db23951e..5e2f10304548 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -868,7 +868,6 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)
{
struct nfs_commit_info cinfo;
unsigned long bytes = 0;
- bool do_destroy;

if (test_bit(NFS_IOHDR_REDO, &hdr->flags))
goto out;
@@ -898,7 +897,6 @@ remove_req:
next:
nfs_unlock_request(req);
nfs_end_page_writeback(req);
- do_destroy = !test_bit(NFS_IOHDR_NEED_COMMIT, &hdr->flags);
nfs_release_request(req);
}
out:
--
1.9.3

2014-07-13 23:43:04

by Weston Andros Adamson

Subject: Re: [PATCH] NFS: Remove 2 unused variables

Thanks, I just noticed those late last week - they were on my todo list.

-dros


On Jul 12, 2014, at 5:37 PM, Trond Myklebust <[email protected]> wrote:

> Cc: Weston Andros Adamson <[email protected]>
> Signed-off-by: Trond Myklebust <[email protected]>
> ---
> fs/nfs/direct.c | 2 --
> fs/nfs/write.c | 2 --
> 2 files changed, 4 deletions(-)
>
> diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
> index 8f98138cbc43..f11b9eed0de1 100644
> --- a/fs/nfs/direct.c
> +++ b/fs/nfs/direct.c
> @@ -756,7 +756,6 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
> spin_unlock(&dreq->lock);
>
> while (!list_empty(&hdr->pages)) {
> - bool do_destroy = true;
>
> req = nfs_list_entry(hdr->pages.next);
> nfs_list_remove_request(req);
> @@ -765,7 +764,6 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
> case NFS_IOHDR_NEED_COMMIT:
> kref_get(&req->wb_kref);
> nfs_mark_request_commit(req, hdr->lseg, &cinfo);
> - do_destroy = false;
> }
> nfs_unlock_and_release_request(req);
> }
> diff --git a/fs/nfs/write.c b/fs/nfs/write.c
> index bdc4db23951e..5e2f10304548 100644
> --- a/fs/nfs/write.c
> +++ b/fs/nfs/write.c
> @@ -868,7 +868,6 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)
> {
> struct nfs_commit_info cinfo;
> unsigned long bytes = 0;
> - bool do_destroy;
>
> if (test_bit(NFS_IOHDR_REDO, &hdr->flags))
> goto out;
> @@ -898,7 +897,6 @@ remove_req:
> next:
> nfs_unlock_request(req);
> nfs_end_page_writeback(req);
> - do_destroy = !test_bit(NFS_IOHDR_NEED_COMMIT, &hdr->flags);
> nfs_release_request(req);
> }
> out:
> --
> 1.9.3
>