Commit 837f8c82 authored by Steve French's avatar Steve French

fix merge problem with 2.6.5 (rename of page struct field list to lru)

parent 30ea9e1f
...@@ -999,8 +999,8 @@ cifs_readpages(struct file *file, struct address_space *mapping, ...@@ -999,8 +999,8 @@ cifs_readpages(struct file *file, struct address_space *mapping,
/* count adjacent pages that we will read into */ /* count adjacent pages that we will read into */
contig_pages = 0; contig_pages = 0;
expected_index = list_entry(page_list->prev,struct page,list)->index; expected_index = list_entry(page_list->prev,struct page,lru)->index;
list_for_each_entry_reverse(tmp_page,page_list,list) { list_for_each_entry_reverse(tmp_page,page_list,lru) {
if(tmp_page->index == expected_index) { if(tmp_page->index == expected_index) {
contig_pages++; contig_pages++;
expected_index++; expected_index++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment