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/nodelist.h | |
| 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/nodelist.h')
| -rw-r--r-- | fs/jffs2/nodelist.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h index 507ed6e..36d7a84 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) static inline int jffs2_encode_dev(union jffs2_device_node *jdev, dev_t rdev) { if (old_valid_dev(rdev)) { - jdev->old = cpu_to_je16(old_encode_dev(rdev)); - return sizeof(jdev->old); + jdev->old_id = cpu_to_je16(old_encode_dev(rdev)); + return sizeof(jdev->old_id); } else { - jdev->new = cpu_to_je32(new_encode_dev(rdev)); - return sizeof(jdev->new); + jdev->new_id = cpu_to_je32(new_encode_dev(rdev)); + return sizeof(jdev->new_id); } } |