Merge branch 'master' into gfs2

1 files changed, 5 insertions, 4 deletions

diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index f5cf9c93e243..3f7899ea4cba 100644
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -1052,9 +1052,8 @@ jffs_remove(struct inode *dir, struct dentry *dentry, int type)
 
         dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
         mark_inode_dirty(dir);
-        inode->i_nlink--;
         inode->i_ctime = dir->i_ctime;
-        mark_inode_dirty(inode);
+        inode_dec_link_count(inode);
 
         d_delete(dentry);       /* This also frees the inode */
 
@@ -1632,8 +1631,10 @@ static const struct file_operations jffs_file_operations =
 {
         .open           = generic_file_open,
         .llseek         = generic_file_llseek,
-        .read           = generic_file_read,
-        .write          = generic_file_write,
+        .read           = do_sync_read,
+        .aio_read       = generic_file_aio_read,
+        .write          = do_sync_write,
+        .aio_write      = generic_file_aio_write,
         .ioctl          = jffs_ioctl,
         .mmap           = generic_file_readonly_mmap,
         .fsync          = jffs_fsync,