Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

authored by

Artem Bityutskiy and committed by
David Woodhouse
24430abc 24b5ce20

-36
-1
MAINTAINERS
··· 3171 3171 S: Maintained 3172 3172 F: fs/jffs2/ 3173 3173 F: include/linux/jffs2.h 3174 - F: include/mtd/jffs2-user.h 3175 3174 3176 3175 JOURNALLING LAYER FOR BLOCK DEVICES (JBD) 3177 3176 P: Stephen Tweedie
-1
include/mtd/Kbuild
··· 1 1 header-y += inftl-user.h 2 - header-y += jffs2-user.h 3 2 header-y += mtd-abi.h 4 3 header-y += mtd-user.h 5 4 header-y += nftl-user.h
-34
include/mtd/jffs2-user.h
··· 1 - /* 2 - * JFFS2 definitions for use in user space only 3 - */ 4 - 5 - #ifndef __JFFS2_USER_H__ 6 - #define __JFFS2_USER_H__ 7 - 8 - /* This file is blessed for inclusion by userspace */ 9 - #include <linux/jffs2.h> 10 - #include <linux/types.h> 11 - #include <endian.h> 12 - #include <byteswap.h> 13 - 14 - #undef cpu_to_je16 15 - #undef cpu_to_je32 16 - #undef cpu_to_jemode 17 - #undef je16_to_cpu 18 - #undef je32_to_cpu 19 - #undef jemode_to_cpu 20 - 21 - extern int target_endian; 22 - 23 - #define t16(x) ({ __u16 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) 24 - #define t32(x) ({ __u32 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) 25 - 26 - #define cpu_to_je16(x) ((jint16_t){t16(x)}) 27 - #define cpu_to_je32(x) ((jint32_t){t32(x)}) 28 - #define cpu_to_jemode(x) ((jmode_t){t32(x)}) 29 - 30 - #define je16_to_cpu(x) (t16((x).v16)) 31 - #define je32_to_cpu(x) (t32((x).v32)) 32 - #define jemode_to_cpu(x) (t32((x).m)) 33 - 34 - #endif /* __JFFS2_USER_H__ */