Эх сурвалжийг харах

CIFS: Optimize readpages in a short read case on reconnects

by marking pages with a data from a partially received response up-to-date.
This is suitable for non-signed connections.

Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Pavel Shilovsky 11 жил өмнө
parent
commit
b770ddfa26
1 өөрчлөгдсөн 8 нэмэгдсэн , 3 устгасан
  1. 8 3
      fs/cifs/file.c

+ 8 - 3
fs/cifs/file.c

@@ -3281,25 +3281,30 @@ int cifs_file_mmap(struct file *file, struct vm_area_struct *vma)
 static void
 static void
 cifs_readv_complete(struct work_struct *work)
 cifs_readv_complete(struct work_struct *work)
 {
 {
-	unsigned int i;
+	unsigned int i, got_bytes;
 	struct cifs_readdata *rdata = container_of(work,
 	struct cifs_readdata *rdata = container_of(work,
 						struct cifs_readdata, work);
 						struct cifs_readdata, work);
 
 
+	got_bytes = rdata->got_bytes;
 	for (i = 0; i < rdata->nr_pages; i++) {
 	for (i = 0; i < rdata->nr_pages; i++) {
 		struct page *page = rdata->pages[i];
 		struct page *page = rdata->pages[i];
 
 
 		lru_cache_add_file(page);
 		lru_cache_add_file(page);
 
 
-		if (rdata->result == 0) {
+		if (rdata->result == 0 ||
+		    (rdata->result == -EAGAIN && got_bytes)) {
 			flush_dcache_page(page);
 			flush_dcache_page(page);
 			SetPageUptodate(page);
 			SetPageUptodate(page);
 		}
 		}
 
 
 		unlock_page(page);
 		unlock_page(page);
 
 
-		if (rdata->result == 0)
+		if (rdata->result == 0 ||
+		    (rdata->result == -EAGAIN && got_bytes))
 			cifs_readpage_to_fscache(rdata->mapping->host, page);
 			cifs_readpage_to_fscache(rdata->mapping->host, page);
 
 
+		got_bytes -= min_t(unsigned int, PAGE_CACHE_SIZE, got_bytes);
+
 		page_cache_release(page);
 		page_cache_release(page);
 		rdata->pages[i] = NULL;
 		rdata->pages[i] = NULL;
 	}
 	}