Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3079ca62 authored by Steve French's avatar Steve French
Browse files

[CIFS] Fix cifs update of page cache. Write at correct offset when out of memory 


and add_to_page_cache fails.  

Thanks to Shaggy for pointing out the fix.

Signed-off-by: default avatarSteve French <(sfrench@us.ibm.com)>
Signed-off-by: default avatarShaggy <(shaggy@us.ibm.com)>
parent 0b68177c

fs/cifs/CHANGES

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ kills the cifsd thread (NB: killing the cifs kernel threads is not 
recommended, unmount and rmmod cifs will kill them when they are

no longer needed).  Fix readdir to ASCII servers (ie older servers

which do not support Unicode) and also require asterik.



Fix out of memory case in which data could be written one page

off in the page cache.



Version 1.33

------------

fs/cifs/file.c

+2 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,8 @@ static void cifs_copy_cache_pages(struct address_space *mapping, 
				      GFP_KERNEL)) {

			page_cache_release(page);

			cFYI(1, ("Add page cache failed"));

			data += PAGE_CACHE_SIZE;

			bytes_read -= PAGE_CACHE_SIZE;

			continue;

		}