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 <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
committed by
Jan Kara
parent
b1e321266d
commit
15aebd2866
@@ -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 ) )
|
||||
|
||||
|
Reference in New Issue
Block a user