diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2010-02-02 14:43:10 -0800 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-25 12:51:41 +0000 |
| commit | 91f8026603d4443d1b24ee3552c5a58682bbae27 (patch) | |
| tree | 9cf7e1fdec04ce613466aca92dce661e1ae23a37 /fs/jffs2/fs.c | |
| parent | 9a5dea7b1046510fdcc81c523405494fd07ec303 (diff) | |
| download | kernel_samsung_smdk4412-91f8026603d4443d1b24ee3552c5a58682bbae27.zip kernel_samsung_smdk4412-91f8026603d4443d1b24ee3552c5a58682bbae27.tar.gz kernel_samsung_smdk4412-91f8026603d4443d1b24ee3552c5a58682bbae27.tar.bz2 | |
JFFS2: avoid using C++ keyword `new' in userspace-visible header
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14995
Reported-by: R. Diez <rdiezmail-kernelbugzilla@yahoo.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs/jffs2/fs.c')
| -rw-r--r-- | fs/jffs2/fs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 3451a81..86e0821 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) 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: |