Merge commit 'jwb/next' into next

[pandora-kernel.git] / fs / jffs2 / fs.c

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 3451a81..8bc2c80 100644 (file)
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -169,13 +169,13 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
        mutex_unlock(&f->sem);
        jffs2_complete_reservation(c);
 
-       /* We have to do the vmtruncate() without f->sem held, since
+       /* We have to do the simple_setsize() without f->sem held, since
           some pages may be locked and waiting for it in readpage().
           We are protected from a simultaneous write() extending i_size
           back past iattr->ia_size, because do_truncate() holds the
           generic inode semaphore. */
        if (ivalid & ATTR_SIZE && inode->i_size > iattr->ia_size) {
-               vmtruncate(inode, iattr->ia_size);      
+               simple_setsize(inode, iattr->ia_size);
                inode->i_blocks = (inode->i_size + 511) >> 9;
        }       
 
@@ -313,8 +313,8 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino)
        case S_IFBLK:
        case S_IFCHR:
                /* Read the device numbers from the media */
-               if (f->metadata->size != sizeof(jdev.old) &&
-                   f->metadata->size != sizeof(jdev.new)) {
+               if (f->metadata->size != sizeof(jdev.old_id) &&
+                   f->metadata->size != sizeof(jdev.new_id)) {
                        printk(KERN_NOTICE "Device node has strange size %d\n", f->metadata->size);
                        goto error_io;
                }
@@ -325,10 +325,10 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino)
                        printk(KERN_NOTICE "Read device numbers for inode %lu failed\n", (unsigned long)inode->i_ino);
                        goto error;
                }
-               if (f->metadata->size == sizeof(jdev.old))
-                       rdev = old_decode_dev(je16_to_cpu(jdev.old));
+               if (f->metadata->size == sizeof(jdev.old_id))
+                       rdev = old_decode_dev(je16_to_cpu(jdev.old_id));
                else
-                       rdev = new_decode_dev(je32_to_cpu(jdev.new));
+                       rdev = new_decode_dev(je32_to_cpu(jdev.new_id));
 
        case S_IFSOCK:
        case S_IFIFO: