udf: move headers out include/linux/
Subsystems (3)
PATCH 3/3 udf: move headers out include/linux/
There's really no reason to keep udf headers in include/linux as they're not used by anything but fs/udf/.
This patch merges most of include/linux/udf_fs_i.h into fs/udf/udf_i.h, include/linux/udf_fs_sb.h into fs/udf/udf_sb.h and include/linux/udf_fs.h into fs/udf/udfdecl.h.
The only thing remaining in include/linux/ is a stub of udf_fs_i.h defining the four user-visible udf ioctls. It's also moved from unifdef-y to headers-y because it can be included unconditionally now.
Signed-off-by Christoph Hellwig <[email protected]>
fs/udf/udf_i.h +26 -4
@@ -1,10 +1,32 @@ -#ifndef __LINUX_UDF_I_H -#define __LINUX_UDF_I_H +#ifndef _UDF_I_H +#define _UDF_I_H + +struct udf_inode_info { +struct timespec i_crtime; +/* Physical address of inode */ +kernel_lb_addr i_location; +__u64 i_unique; +__u32 i_lenEAttr; +__u32 i_lenAlloc; +__u64 i_lenExtents; +__u32 i_next_alloc_block; +__u32 i_next_alloc_goal; +unsigned i_alloc_type :3 ; +unsigned i_efe :1 ; +unsigned i_use :1 ; +unsigned i_strat4096 :1 ; +unsigned reserved :26 ; +union { +short_ad *i_sad; +long_ad *i_lad; +__u8 *i_data; + } i_ext; +struct inode vfs_inode; +}; -#include <linux/udf_fs_i.h> static inline struct udf_inode_info *UDF_I (struct inode *inode) { return list_entry(inode, struct udf_inode_info, vfs_inode); } -#endif /* !defined(_LINUX_UDF_I_H) */ +#endif /* _UDF_I_H) */
include/linux/Kbuild +1 -1
@@ -150,6 +150,7 @@ header-y += tiocl.h header-y += tipc.h header-y += tipc_config.h header-y += toshiba.h +header-y += udf_fs_i.h header-y += ultrasound.h header-y += un.h header-y += utime.h
@@ -336,7 +337,6 @@ unifdef-y += time.h unifdef-y += timex.h unifdef-y += tty.h unifdef-y += types.h -unifdef-y += udf_fs_i.h unifdef-y += udp.h unifdef-y += uinput.h unifdef-y += uio.h
include/linux/udf_fs_i.h +0 -31
@@ -9,41 +9,10 @@* ftp://prep.ai.mit.edu/pub/gnu/GPL * Each contributing author retains all rights to their own work. */ -#ifndef _UDF_FS_I_H#define _UDF_FS_I_H 1 -#ifdef __KERNEL__ - -struct udf_inode_info -{ -struct timespec i_crtime; -/* Physical address of inode */ -kernel_lb_addr i_location; -__u64 i_unique; -__u32 i_lenEAttr; -__u32 i_lenAlloc; -__u64 i_lenExtents; -__u32 i_next_alloc_block; -__u32 i_next_alloc_goal; -unsigned i_alloc_type :3 ; -unsigned i_efe :1 ; -unsigned i_use :1 ; -unsigned i_strat4096 :1 ; -unsigned reserved :26 ; -union - { -short_ad *i_sad; -long_ad *i_lad; -__u8 *i_data; - } i_ext; -struct inode vfs_inode; -}; - -#endif -/* exported IOCTLs, we have 'l', 0x40-0x7f */ -#define UDF_GETEASIZE _IOR('l', 0x40, int)#define UDF_GETEABLOCK _IOR('l', 0x41, void *)#define UDF_GETVOLIDENT _IOR('l', 0x42, void *)
fs/udf/file.c +0 -1
@@ -27,7 +27,6 @@#include "udfdecl.h" #include <linux/fs.h> -#include <linux/udf_fs.h> #include <asm/uaccess.h> #include <linux/kernel.h> #include <linux/string.h> /* memset */
fs/udf/ialloc.c +0 -1
@@ -21,7 +21,6 @@#include "udfdecl.h" #include <linux/fs.h> #include <linux/quotaops.h> -#include <linux/udf_fs.h> #include <linux/sched.h> #include <linux/slab.h>
fs/udf/lowlevel.c +0 -1
@@ -23,7 +23,6 @@#include <linux/cdrom.h> #include <asm/uaccess.h> -#include <linux/udf_fs.h> #include "udf_sb.h" unsigned int udf_get_last_session (struct super_block *sb)
fs/udf/misc.c +0 -1
@@ -23,7 +23,6 @@#include <linux/fs.h> #include <linux/string.h> -#include <linux/udf_fs.h> #include <linux/buffer_head.h> #include "udf_i.h"
fs/udf/partition.c +0 -1
@@ -24,7 +24,6 @@#include <linux/fs.h> #include <linux/string.h> -#include <linux/udf_fs.h> #include <linux/slab.h> #include <linux/buffer_head.h>
fs/udf/super.c +0 -1
@@ -57,7 +57,6 @@#include <linux/seq_file.h> #include <asm/byteorder.h> -#include <linux/udf_fs.h> #include "udf_sb.h" #include "udf_i.h"
fs/udf/symlink.c +0 -1
@@ -23,7 +23,6 @@#include <asm/uaccess.h> #include <linux/errno.h> #include <linux/fs.h> -#include <linux/udf_fs.h> #include <linux/time.h> #include <linux/mm.h> #include <linux/stat.h>
fs/udf/truncate.c +0 -1
@@ -22,7 +22,6 @@#include "udfdecl.h" #include <linux/fs.h> #include <linux/mm.h> -#include <linux/udf_fs.h> #include <linux/buffer_head.h> #include "udf_i.h"
fs/udf/udfdecl.h +22 -3
@@ -1,18 +1,37 @@#ifndef __UDF_DECL_H#define __UDF_DECL_H -#include <linux/udf_fs.h> #include "ecma_167.h" #include "osta_udf.h" #include <linux/fs.h> #include <linux/types.h> -#include <linux/udf_fs_i.h> -#include <linux/udf_fs_sb.h> #include <linux/buffer_head.h> +#include <linux/udf_fs_i.h> +#include "udf_sb.h" #include "udfend.h" +#define UDF_PREALLOCATE +#define UDF_DEFAULT_PREALLOC_BLOCKS 8 + +#undef UDFFS_DEBUG + +#ifdef UDFFS_DEBUG +#define udf_debug(f, a...) \ +do { \ + printk(KERN_DEBUG "UDF-fs DEBUG %s:%d:%s: ", \ + __FILE__, __LINE__, __func__); \ + printk(f, ##a); \ +} while (0) +#else +#define udf_debug(f, a...) /**/ +#endif + +#define udf_info(f, a...) \ + printk(KERN_INFO "UDF-fs INFO " f, ##a); + +#define udf_fixed_to_variable (x) ( ( ( (x) >> 5 ) * 39 ) + ( (x) & 0x0000001F ) )#define udf_variable_to_fixed (x) ( ( ( (x) / 39 ) << 5 ) + ( (x) % 39 ) )
fs/udf/unicode.c +0 -1
@@ -23,7 +23,6 @@#include <linux/kernel.h> #include <linux/string.h> /* for memset */ #include <linux/nls.h> -#include <linux/udf_fs.h> #include "udf_sb.h"
include/linux/udf_fs.h deleted +0 -51
51 lines not on this page · raw message
include/linux/udf_fs_sb.h deleted +0 -117
117 lines not on this page · raw message
fs/udf/udf_sb.h +93 -0
105 lines not on this page · raw message