diff options
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r-- | fs/nfs/direct.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 65ef6e00deee..dda4b8667c02 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -178,7 +178,6 @@ static int nfs_direct_set_or_cmp_hdr_verf(struct nfs_direct_req *dreq, | |||
178 | return memcmp(verfp, &hdr->verf, sizeof(struct nfs_writeverf)); | 178 | return memcmp(verfp, &hdr->verf, sizeof(struct nfs_writeverf)); |
179 | } | 179 | } |
180 | 180 | ||
181 | #if IS_ENABLED(CONFIG_NFS_V3) || IS_ENABLED(CONFIG_NFS_V4) | ||
182 | /* | 181 | /* |
183 | * nfs_direct_cmp_commit_data_verf - compare verifier for commit data | 182 | * nfs_direct_cmp_commit_data_verf - compare verifier for commit data |
184 | * @dreq - direct request possibly spanning multiple servers | 183 | * @dreq - direct request possibly spanning multiple servers |
@@ -197,7 +196,6 @@ static int nfs_direct_cmp_commit_data_verf(struct nfs_direct_req *dreq, | |||
197 | WARN_ON_ONCE(verfp->committed < 0); | 196 | WARN_ON_ONCE(verfp->committed < 0); |
198 | return memcmp(verfp, &data->verf, sizeof(struct nfs_writeverf)); | 197 | return memcmp(verfp, &data->verf, sizeof(struct nfs_writeverf)); |
199 | } | 198 | } |
200 | #endif | ||
201 | 199 | ||
202 | /** | 200 | /** |
203 | * nfs_direct_IO - NFS address space operation for direct I/O | 201 | * nfs_direct_IO - NFS address space operation for direct I/O |
@@ -576,7 +574,6 @@ out: | |||
576 | return result; | 574 | return result; |
577 | } | 575 | } |
578 | 576 | ||
579 | #if IS_ENABLED(CONFIG_NFS_V3) || IS_ENABLED(CONFIG_NFS_V4) | ||
580 | static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) | 577 | static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) |
581 | { | 578 | { |
582 | struct nfs_pageio_descriptor desc; | 579 | struct nfs_pageio_descriptor desc; |
@@ -700,17 +697,6 @@ static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode | |||
700 | schedule_work(&dreq->work); /* Calls nfs_direct_write_schedule_work */ | 697 | schedule_work(&dreq->work); /* Calls nfs_direct_write_schedule_work */ |
701 | } | 698 | } |
702 | 699 | ||
703 | #else | ||
704 | static void nfs_direct_write_schedule_work(struct work_struct *work) | ||
705 | { | ||
706 | } | ||
707 | |||
708 | static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode *inode) | ||
709 | { | ||
710 | nfs_direct_complete(dreq, true); | ||
711 | } | ||
712 | #endif | ||
713 | |||
714 | static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) | 700 | static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) |
715 | { | 701 | { |
716 | struct nfs_direct_req *dreq = hdr->dreq; | 702 | struct nfs_direct_req *dreq = hdr->dreq; |