From: Charles Manning <cdhmanning@gmail.com>
Date: Fri, 3 Sep 2010 04:11:52 +0000 (+1200)
Subject: Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
X-Git-Tag: pre-name-change~17
X-Git-Url: http://aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=0035e396dc2b872289b8e6320ced59e2eea81962;hp=-c

Merge branch 'master' of ssh://aleph1.co.uk/home/aleph1/git/yaffs2
---

0035e396dc2b872289b8e6320ced59e2eea81962
diff --combined yaffs_fs.c
index 7c51041,a372ddf..ecf2bbe
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@@ -43,7 -43,6 +43,7 @@@
  
  #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35))
  #define YAFFS_USE_SETATTR_COPY
 +#define YAFFS_USE_TRUNCATE_SETSIZE
  #endif
  #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35))
  #define YAFFS_HAS_EVICT_INODE
@@@ -117,6 -116,12 +117,12 @@@
  #define YPROC_ROOT  NULL
  #endif
  
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
+ #define Y_INIT_TIMER(a)	init_timer(a)
+ #else
+ #define Y_INIT_TIMER(a)	init_timer_on_stack(a)
+ #endif
+ 
  #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
  #define WRITE_SIZE_STR "writesize"
  #define WRITE_SIZE(mtd) ((mtd)->writesize)
@@@ -159,7 -164,6 +165,7 @@@ unsigned int yaffs_traceMask = YAFFS_TR
  unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
  unsigned int yaffs_auto_checkpoint = 1;
  unsigned int yaffs_gc_control = 1;
 +unsigned int yaffs_bg_enable = 1;
  
  /* Module Parameters */
  #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
@@@ -167,7 -171,6 +173,7 @@@ module_param(yaffs_traceMask, uint, 064
  module_param(yaffs_wr_attempts, uint, 0644);
  module_param(yaffs_auto_checkpoint, uint, 0644);
  module_param(yaffs_gc_control, uint, 0644);
 +module_param(yaffs_bg_enable, uint, 0644);
  #else
  MODULE_PARM(yaffs_traceMask, "i");
  MODULE_PARM(yaffs_wr_attempts, "i");
@@@ -480,17 -483,6 +486,17 @@@ static  int yaffs_vfs_setattr(struct in
  
  }
  
 +static  int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
 +{
 +#ifdef  YAFFS_USE_TRUNCATE_SETSIZE
 +	truncate_setsize(inode,newsize);
 +	return 0;
 +#else
 +	return simple_setsize(inode, newsize);
 +#endif
 +
 +}
 +
  static unsigned yaffs_gc_control_callback(yaffs_Device *dev)
  {
  	return yaffs_gc_control;
@@@ -870,7 -862,6 +876,7 @@@ static void yaffs_evict_inode( struct i
  	if (!inode->i_nlink && !is_bad_inode(inode))
  		deleteme = 1;
  	truncate_inode_pages(&inode->i_data,0);
 +	end_writeback(inode);
  
  	if(deleteme && obj){
  		dev = obj->myDev;
@@@ -878,6 -869,7 +884,6 @@@
  		yaffs_DeleteObject(obj);
  		yaffs_GrossUnlock(dev);
  	}
 -	end_writeback(inode);
  	if (obj) {
  		dev = obj->myDev;
  		yaffs_GrossLock(dev);
@@@ -1979,10 -1971,8 +1985,10 @@@ static int yaffs_setattr(struct dentry 
  		if (!error){
  			error = yaffs_vfs_setattr(inode, attr);
  			T(YAFFS_TRACE_OS,(TSTR("inode_setattr called\n")));
 -			if (attr->ia_valid & ATTR_SIZE)
 -                        	truncate_inode_pages(&inode->i_data,attr->ia_size);
 +			if (attr->ia_valid & ATTR_SIZE){
 +                        	yaffs_vfs_setsize(inode,attr->ia_size);
 +                        	inode->i_blocks = (inode->i_size + 511) >> 9;
 +			}
  		}
  		dev = yaffs_InodeToObject(inode)->myDev;
  		if (attr->ia_valid & ATTR_SIZE){
@@@ -2048,8 -2038,9 +2054,8 @@@ ssize_t yaffs_getxattr(struct dentry *d
  	yaffs_Object *obj = yaffs_InodeToObject(inode);
  
  	T(YAFFS_TRACE_OS,
 -		(TSTR("yaffs_getxattr of object %d\n"),
 -		obj->objectId));
 -
 +		(TSTR("yaffs_getxattr \"%s\" from object %d\n"),
 +		name, obj->objectId));
  
  	if (error == 0) {
  		dev = obj->myDev;
@@@ -2329,12 -2320,12 +2335,12 @@@ static int yaffs_BackgroundThread(void 
  
  		now = jiffies;
  
 -		if(time_after(now, next_dir_update)){
 +		if(time_after(now, next_dir_update) && yaffs_bg_enable){
  			yaffs_UpdateDirtyDirectories(dev);
  			next_dir_update = now + HZ;
  		}
  
 -		if(time_after(now,next_gc)){
 +		if(time_after(now,next_gc) && yaffs_bg_enable){
  			if(!dev->isCheckpointed){
  				urgency = yaffs_bg_gc_urgency(dev);
  				gcResult = yaffs_BackgroundGarbageCollect(dev, urgency);
@@@ -2358,7 -2349,7 +2364,7 @@@
  		if(time_before(expires,now))
  			expires = now + HZ;
  
- 		init_timer_on_stack(&timer);
+ 		Y_INIT_TIMER(&timer);
  		timer.expires = expires+1;
  		timer.data = (unsigned long) current;
  		timer.function = yaffs_background_waker;