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>

1 files changed, 93 insertions, 0 deletions

diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
index 737d1c604eea..fb2a6e9f8dac 100644
--- a/fs/udf/udf_sb.h
+++ b/fs/udf/udf_sb.h
@@ -1,6 +1,8 @@
 #ifndef __LINUX_UDF_SB_H
 #define __LINUX_UDF_SB_H
 
+#include <linux/mutex.h>
+
 /* Since UDF 2.01 is ISO 13346 based... */
 #define UDF_SUPER_MAGIC                 0x15013346
 
@@ -38,6 +40,97 @@
 #define UDF_PART_FLAG_REWRITABLE        0x0040
 #define UDF_PART_FLAG_OVERWRITABLE      0x0080
 
+#define UDF_MAX_BLOCK_LOADED    8
+
+#define UDF_TYPE1_MAP15                 0x1511U
+#define UDF_VIRTUAL_MAP15               0x1512U
+#define UDF_VIRTUAL_MAP20               0x2012U
+#define UDF_SPARABLE_MAP15              0x1522U
+
+#pragma pack(1) /* XXX(hch): Why?  This file just defines in-core structures */
+
+struct udf_sparing_data {
+        __u16   s_packet_len;
+        struct buffer_head *s_spar_map[4];
+};
+
+struct udf_virtual_data {
+        __u32   s_num_entries;
+        __u16   s_start_offset;
+};
+
+struct udf_bitmap {
+        __u32                   s_extLength;
+        __u32                   s_extPosition;
+        __u16                   s_nr_groups;
+        struct buffer_head      **s_block_bitmap;
+};
+
+struct udf_part_map {
+        union {
+                struct udf_bitmap       *s_bitmap;
+                struct inode            *s_table;
+        } s_uspace;
+        union {
+                struct udf_bitmap       *s_bitmap;
+                struct inode            *s_table;
+        } s_fspace;
+        __u32   s_partition_root;
+        __u32   s_partition_len;
+        __u16   s_partition_type;
+        __u16   s_partition_num;
+        union {
+                struct udf_sparing_data s_sparing;
+                struct udf_virtual_data s_virtual;
+        } s_type_specific;
+        __u32   (*s_partition_func)(struct super_block *, __u32, __u16, __u32);
+        __u16   s_volumeseqnum;
+        __u16   s_partition_flags;
+};
+
+#pragma pack()
+
+struct udf_sb_info {
+        struct udf_part_map     *s_partmaps;
+        __u8                    s_volume_ident[32];
+
+        /* Overall info */
+        __u16                   s_partitions;
+        __u16                   s_partition;
+
+        /* Sector headers */
+        __s32                   s_session;
+        __u32                   s_anchor[4];
+        __u32                   s_last_block;
+
+        struct buffer_head      *s_lvid_bh;
+
+        /* Default permissions */
+        mode_t                  s_umask;
+        gid_t                   s_gid;
+        uid_t                   s_uid;
+
+        /* Root Info */
+        struct timespec         s_record_time;
+
+        /* Fileset Info */
+        __u16                   s_serial_number;
+
+        /* highest UDF revision we have recorded to this media */
+        __u16                   s_udfrev;
+
+        /* Miscellaneous flags */
+        __u32                   s_flags;
+
+        /* Encoding info */
+        struct nls_table        *s_nls_map;
+
+        /* VAT inode */
+        struct inode            *s_vat_inode;
+
+        struct mutex            s_alloc_mutex;
+};
+
 static inline struct udf_sb_info *UDF_SB(struct super_block *sb)
 {
         return sb->s_fs_info;