diff options
-rw-r--r-- | fs/nfs/direct.c | 2 | ||||
-rw-r--r-- | fs/nfs/write.c | 2 |
2 files changed, 0 insertions, 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) | |||
756 | spin_unlock(&dreq->lock); | 756 | spin_unlock(&dreq->lock); |
757 | 757 | ||
758 | while (!list_empty(&hdr->pages)) { | 758 | while (!list_empty(&hdr->pages)) { |
759 | bool do_destroy = true; | ||
760 | 759 | ||
761 | req = nfs_list_entry(hdr->pages.next); | 760 | req = nfs_list_entry(hdr->pages.next); |
762 | nfs_list_remove_request(req); | 761 | nfs_list_remove_request(req); |
@@ -765,7 +764,6 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) | |||
765 | case NFS_IOHDR_NEED_COMMIT: | 764 | case NFS_IOHDR_NEED_COMMIT: |
766 | kref_get(&req->wb_kref); | 765 | kref_get(&req->wb_kref); |
767 | nfs_mark_request_commit(req, hdr->lseg, &cinfo); | 766 | nfs_mark_request_commit(req, hdr->lseg, &cinfo); |
768 | do_destroy = false; | ||
769 | } | 767 | } |
770 | nfs_unlock_and_release_request(req); | 768 | nfs_unlock_and_release_request(req); |
771 | } | 769 | } |
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) | |||
868 | { | 868 | { |
869 | struct nfs_commit_info cinfo; | 869 | struct nfs_commit_info cinfo; |
870 | unsigned long bytes = 0; | 870 | unsigned long bytes = 0; |
871 | bool do_destroy; | ||
872 | 871 | ||
873 | if (test_bit(NFS_IOHDR_REDO, &hdr->flags)) | 872 | if (test_bit(NFS_IOHDR_REDO, &hdr->flags)) |
874 | goto out; | 873 | goto out; |
@@ -898,7 +897,6 @@ remove_req: | |||
898 | next: | 897 | next: |
899 | nfs_unlock_request(req); | 898 | nfs_unlock_request(req); |
900 | nfs_end_page_writeback(req); | 899 | nfs_end_page_writeback(req); |
901 | do_destroy = !test_bit(NFS_IOHDR_NEED_COMMIT, &hdr->flags); | ||
902 | nfs_release_request(req); | 900 | nfs_release_request(req); |
903 | } | 901 | } |
904 | out: | 902 | out: |