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

Commit 27198d85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents a7df849c f5d9b97e

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/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -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 int cifs_ioctl (struct inode * inode, struct file * filep,

		       unsigned int command, unsigned long arg);

#define CIFS_VERSION   "1.34"

#define CIFS_VERSION   "1.35"

#endif				/* _CIFSFS_H */

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;

		}

fs/cifs/inode.c

+17 −17

File changed.

Contains only whitespace changes.