The patch titled
cifs: ->readpages() fixes
has been added to the -mm tree. Its filename is
cifs-readpages-fixes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: cifs: ->readpages() fixes
From: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
This just ignore the remaining pages, and will fix a forgot put_pages_list().
Signed-off-by: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
Cc: Steven French <sfrench@xxxxxxxxxx>
Cc: Miklos Szeredi <miklos@xxxxxxxxxx>
Cc: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/cifs/file.c | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
diff -puN fs/cifs/file.c~cifs-readpages-fixes fs/cifs/file.c
--- a/fs/cifs/file.c~cifs-readpages-fixes
+++ a/fs/cifs/file.c
@@ -1807,13 +1807,6 @@ static int cifs_readpages(struct file *f
}
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;
@@ -1832,13 +1825,7 @@ static int cifs_readpages(struct file *f
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 . "
@@ -1846,14 +1833,6 @@ static int cifs_readpages(struct file *f
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) {
_
Patches currently in -mm which might be from hirofumi@xxxxxxxxxxxxxxxxxx are
nfs-fix-nfs_readpages-error-path.patch
read_cache_pages-cleanup.patch
cleanup-read_pages.patch
cifs-readpages-fixes.patch
fuse-readpages-cleanup.patch
gfs2-readpages-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
