[lc-checkins] CVS: linux/fs/ncpfs dir.c,1.3,1.4

[Rodrigo S. de C. <rc...@us...>]

Update of /cvsroot/linuxcompressed/linux/fs/ncpfs
In directory usw-pr-cvs1:/tmp/cvs-serv27959/fs/ncpfs

Modified Files:
	dir.c 
Log Message:
Bug fixes
o Fixed potential oops in __read_cache_page() due to a misplaced
steal_page_from_comp_cache() call.
o Fixed bug in __read_swap_cache_async() which would end up getting an
extra reference on a swap cache page and would also erroneously stop a
swapin readahead.
o Fixed major bug in shrink_cache() that could hang the machine. We
could write a page in compress_dirty_page() even if the GFP mask does
not allow!

Cleanups
o Added #ifdefs to some flush_comp_cache() calls.
o Replaced find_comp_page() in do_swap_page() by a in_comp_cache()
call.

Other 
o Added page count check to shrink_comp_cache(). Only to make sure the
page is going to be actually freed.
o Removed write permission from /proc/sys/vm/comp_cache/size when
resize on demand option is enabled.



Index: dir.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/fs/ncpfs/dir.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** dir.c	21 Mar 2002 19:24:17 -0000	1.3
--- dir.c	5 Jul 2002 15:21:49 -0000	1.4
***************
*** 452,456 ****
--- 452,458 ----
  				goto invalid_cache;
  			ctl.cache = kmap(ctl.page);
+ #ifdef CONFIG_COMP_PAGE_CACHE
  			flush_comp_cache(ctl.page);
+ #endif
  			if (!Page_Uptodate(ctl.page))
  				goto invalid_cache;