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

Commit 24430abc authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

Kill jffs2-user.h 



This file does not define any kernel-userspace API, all
it does it defines few helpers for userspace. Instead,
userspace should have a private copy of this file.

The main (if not the only) user is the mtd-utils package, but
it already has a private copy of this file.

This patch also removes references to 'jffs2-user.h' from
'Kbuild' and MAINTAINERS' files.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 24b5ce20

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -3171,7 +3171,6 @@ W: http://www.linux-mtd.infradead.org/doc/jffs2.html 
S:	Maintained

F:	fs/jffs2/

F:	include/linux/jffs2.h

F:	include/mtd/jffs2-user.h



JOURNALLING LAYER FOR BLOCK DEVICES (JBD)

P:	Stephen Tweedie

include/mtd/Kbuild

+0 −1
Original line number Diff line number Diff line 
header-y += inftl-user.h

header-y += jffs2-user.h

header-y += mtd-abi.h

header-y += mtd-user.h

header-y += nftl-user.h

include/mtd/jffs2-user.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 * JFFS2 definitions for use in user space only

 */



#ifndef __JFFS2_USER_H__

#define __JFFS2_USER_H__



/* This file is blessed for inclusion by userspace */

#include <linux/jffs2.h>

#include <linux/types.h>

#include <endian.h>

#include <byteswap.h>



#undef cpu_to_je16

#undef cpu_to_je32

#undef cpu_to_jemode

#undef je16_to_cpu

#undef je32_to_cpu

#undef jemode_to_cpu



extern int target_endian;



#define t16(x) ({ __u16 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); })

#define t32(x) ({ __u32 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); })



#define cpu_to_je16(x) ((jint16_t){t16(x)})

#define cpu_to_je32(x) ((jint32_t){t32(x)})

#define cpu_to_jemode(x) ((jmode_t){t32(x)})



#define je16_to_cpu(x) (t16((x).v16))

#define je32_to_cpu(x) (t32((x).v32))

#define jemode_to_cpu(x) (t32((x).m))



#endif /* __JFFS2_USER_H__ */