Skip to content

Commit

Permalink
[PATCH] cifs: ->readpages() fixes
Browse files Browse the repository at this point in the history
This just ignore the remaining pages, and will fix a forgot put_pages_list().

Signed-off-by: OGAWA Hirofumi <[email protected]>
Cc: Steven French <[email protected]>
Cc: Miklos Szeredi <[email protected]>
Cc: Steven Whitehouse <[email protected]>
Cc: Trond Myklebust <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
OGAWAHirofumi authored and Linus Torvalds committed Nov 3, 2006
1 parent 029e332 commit 05ac9d4
Showing 1 changed file with 1 addition and 22 deletions.
23 changes: 1 addition & 22 deletions fs/cifs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1806,13 +1806,6 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
}
if ((rc < 0) || (smb_read_data == NULL)) {
cFYI(1, ("Read error in readpages: %d", rc));
/* clean up remaing pages off list */
while (!list_empty(page_list) && (i < num_pages)) {
page = list_entry(page_list->prev, struct page,
lru);
list_del(&page->lru);
page_cache_release(page);
}
break;
} else if (bytes_read > 0) {
pSMBr = (struct smb_com_read_rsp *)smb_read_data;
Expand All @@ -1831,28 +1824,14 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
this case is ok - if we are at server EOF
we will hit it on next read */

/* while (!list_empty(page_list) && (i < num_pages)) {
page = list_entry(page_list->prev,
struct page, list);
list_del(&page->list);
page_cache_release(page);
}
break; */
/* break; */
}
} else {
cFYI(1, ("No bytes read (%d) at offset %lld . "
"Cleaning remaining pages from readahead list",
bytes_read, offset));
/* BB turn off caching and do new lookup on
file size at server? */
while (!list_empty(page_list) && (i < num_pages)) {
page = list_entry(page_list->prev, struct page,
lru);
list_del(&page->lru);

/* BB removeme - replace with zero of page? */
page_cache_release(page);
}
break;
}
if (smb_read_data) {
Expand Down

0 comments on commit 05ac9d4

Please sign in to comment.