diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-04-21 11:02:01 +0300 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-05 17:31:38 +0100 |
| commit | 24430abc88c67e3df2f06c96a6ccd73bda4c92f0 (patch) | |
| tree | 40574d692362c2ce39fe76f11c8f03e296c6c54a | |
| parent | 24b5ce20cc75603ce7c03a42116c30a17bce509a (diff) | |
| download | kernel_samsung_espresso10-24430abc88c67e3df2f06c96a6ccd73bda4c92f0.zip kernel_samsung_espresso10-24430abc88c67e3df2f06c96a6ccd73bda4c92f0.tar.gz kernel_samsung_espresso10-24430abc88c67e3df2f06c96a6ccd73bda4c92f0.tar.bz2 | |
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>
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | include/mtd/Kbuild | 1 | ||||
| -rw-r--r-- | include/mtd/jffs2-user.h | 34 |
3 files changed, 0 insertions, 36 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2b349ba..3276e1c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild index 8eb018f..192f8fb 100644 --- a/include/mtd/Kbuild +++ b/include/mtd/Kbuild @@ -1,5 +1,4 @@ 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 diff --git a/include/mtd/jffs2-user.h b/include/mtd/jffs2-user.h deleted file mode 100644 index fa94b0e..0000000 --- a/include/mtd/jffs2-user.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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__ */ |