GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 15:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

Browse source
This commit is contained in:
Linus Torvalds 2005-06-10 20:35:10 -07:00
commit 27198d855a
4 changed files with 22 additions and 19 deletions

3
fs/cifs/CHANGES
View file

@ -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 recommended, unmount and rmmod cifs will kill them when they are
no longer needed). Fix readdir to ASCII servers (ie older servers no longer needed). Fix readdir to ASCII servers (ie older servers
which do not support Unicode) and also require asterik. 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 Version 1.33
------------ ------------

2
fs/cifs/cifsfs.h
View file

@ -96,5 +96,5 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t);
extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);
extern int cifs_ioctl (struct inode * inode, struct file * filep, extern int cifs_ioctl (struct inode * inode, struct file * filep,
unsigned int command, unsigned long arg); unsigned int command, unsigned long arg);
#define CIFS_VERSION "1.34" #define CIFS_VERSION "1.35"
#endif /* _CIFSFS_H */ #endif /* _CIFSFS_H */

2
fs/cifs/file.c
View file

@ -1352,6 +1352,8 @@ static void cifs_copy_cache_pages(struct address_space *mapping,
GFP_KERNEL)) { GFP_KERNEL)) {
page_cache_release(page); page_cache_release(page);
cFYI(1, ("Add page cache failed")); cFYI(1, ("Add page cache failed"));
data += PAGE_CACHE_SIZE;
bytes_read -= PAGE_CACHE_SIZE;
continue; continue;
} }