Merge with 2.1.43.

1 files changed, 2 insertions, 1 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 88c2fd49d..56aa1b486 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -921,6 +921,7 @@ static inline int do_write_page(struct inode * inode, struct file * file,
 	retval = -EIO;
 	if (size == file->f_op->write(inode, file, (const char *) page, size))
 		retval = 0;
+	/* inode->i_status |= ST_MODIFIED is willingly *not* done here */
 	set_fs(old_fs);
 	return retval;
 }
@@ -1195,7 +1196,7 @@ int generic_file_mmap(struct inode * inode, struct file * file, struct vm_area_s
 		inode->i_dirt = 1;
 	}
 	vma->vm_inode = inode;
-	inode->i_count++;
+	atomic_inc(&inode->i_count);
 	vma->vm_ops = ops;
 	return 0;
 }