diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/jffs2/fs.c | 10 | ||||
-rw-r--r-- | fs/jffs2/nodelist.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 3451a81b2142..86e0821fc989 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c | |||
@@ -313,8 +313,8 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino) | |||
313 | case S_IFBLK: | 313 | case S_IFBLK: |
314 | case S_IFCHR: | 314 | case S_IFCHR: |
315 | /* Read the device numbers from the media */ | 315 | /* Read the device numbers from the media */ |
316 | if (f->metadata->size != sizeof(jdev.old) && | 316 | if (f->metadata->size != sizeof(jdev.old_id) && |
317 | f->metadata->size != sizeof(jdev.new)) { | 317 | f->metadata->size != sizeof(jdev.new_id)) { |
318 | printk(KERN_NOTICE "Device node has strange size %d\n", f->metadata->size); | 318 | printk(KERN_NOTICE "Device node has strange size %d\n", f->metadata->size); |
319 | goto error_io; | 319 | goto error_io; |
320 | } | 320 | } |
@@ -325,10 +325,10 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino) | |||
325 | printk(KERN_NOTICE "Read device numbers for inode %lu failed\n", (unsigned long)inode->i_ino); | 325 | printk(KERN_NOTICE "Read device numbers for inode %lu failed\n", (unsigned long)inode->i_ino); |
326 | goto error; | 326 | goto error; |
327 | } | 327 | } |
328 | if (f->metadata->size == sizeof(jdev.old)) | 328 | if (f->metadata->size == sizeof(jdev.old_id)) |
329 | rdev = old_decode_dev(je16_to_cpu(jdev.old)); | 329 | rdev = old_decode_dev(je16_to_cpu(jdev.old_id)); |
330 | else | 330 | else |
331 | rdev = new_decode_dev(je32_to_cpu(jdev.new)); | 331 | rdev = new_decode_dev(je32_to_cpu(jdev.new_id)); |
332 | 332 | ||
333 | case S_IFSOCK: | 333 | case S_IFSOCK: |
334 | case S_IFIFO: | 334 | case S_IFIFO: |
diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h index 507ed6ec1847..36d7a849ee2c 100644 --- a/fs/jffs2/nodelist.h +++ b/fs/jffs2/nodelist.h | |||
@@ -312,11 +312,11 @@ static inline int jffs2_blocks_use_vmalloc(struct jffs2_sb_info *c) | |||
312 | static inline int jffs2_encode_dev(union jffs2_device_node *jdev, dev_t rdev) | 312 | static inline int jffs2_encode_dev(union jffs2_device_node *jdev, dev_t rdev) |
313 | { | 313 | { |
314 | if (old_valid_dev(rdev)) { | 314 | if (old_valid_dev(rdev)) { |
315 | jdev->old = cpu_to_je16(old_encode_dev(rdev)); | 315 | jdev->old_id = cpu_to_je16(old_encode_dev(rdev)); |
316 | return sizeof(jdev->old); | 316 | return sizeof(jdev->old_id); |
317 | } else { | 317 | } else { |
318 | jdev->new = cpu_to_je32(new_encode_dev(rdev)); | 318 | jdev->new_id = cpu_to_je32(new_encode_dev(rdev)); |
319 | return sizeof(jdev->new); | 319 | return sizeof(jdev->new_id); |
320 | } | 320 | } |
321 | } | 321 | } |
322 | 322 | ||