Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91f80266 authored by Andrew Morton's avatar Andrew Morton Committed by David Woodhouse
Browse files

JFFS2: avoid using C++ keyword `new' in userspace-visible header 

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14995



Reported-by: default avatarR. Diez <rdiezmail-kernelbugzilla@yahoo.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 9a5dea7b

fs/jffs2/fs.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -313,8 +313,8 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino) 
	case S_IFBLK:

	case S_IFBLK:

	case S_IFCHR:

	case S_IFCHR:

		/* Read the device numbers from the media */

		/* Read the device numbers from the media */

		if (f->metadata->size != sizeof(jdev.old) &&

		if (f->metadata->size != sizeof(jdev.old_id) &&

		    f->metadata->size != sizeof(jdev.new)) {

		    f->metadata->size != sizeof(jdev.new_id)) {

			printk(KERN_NOTICE "Device node has strange size %d\n", f->metadata->size);

			printk(KERN_NOTICE "Device node has strange size %d\n", f->metadata->size);

			goto error_io;

			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);

			printk(KERN_NOTICE "Read device numbers for inode %lu failed\n", (unsigned long)inode->i_ino);

			goto error;

			goto error;

		}

		}

		if (f->metadata->size == sizeof(jdev.old))

		if (f->metadata->size == sizeof(jdev.old_id))

			rdev = old_decode_dev(je16_to_cpu(jdev.old));

			rdev = old_decode_dev(je16_to_cpu(jdev.old_id));

		else

		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_IFSOCK:

	case S_IFIFO:

	case S_IFIFO:

fs/jffs2/nodelist.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -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)

static inline int jffs2_encode_dev(union jffs2_device_node *jdev, dev_t rdev)

{

{

	if (old_valid_dev(rdev)) {

	if (old_valid_dev(rdev)) {

		jdev->old = cpu_to_je16(old_encode_dev(rdev));

		jdev->old_id = cpu_to_je16(old_encode_dev(rdev));

		return sizeof(jdev->old);

		return sizeof(jdev->old_id);

	} else {

	} else {

		jdev->new = cpu_to_je32(new_encode_dev(rdev));

		jdev->new_id = cpu_to_je32(new_encode_dev(rdev));

		return sizeof(jdev->new);

		return sizeof(jdev->new_id);

	}

	}

}

}

include/linux/jffs2.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -215,8 +215,8 @@ union jffs2_node_union 




/* Data payload for device nodes. */

/* Data payload for device nodes. */

union jffs2_device_node {

union jffs2_device_node {

	jint16_t old;

	jint16_t old_id;

	jint32_t new;

	jint32_t new_id;

};

};





#endif /* __LINUX_JFFS2_H__ */
 
#endif /* __LINUX_JFFS2_H__ */