ca76d2d803
This patch fix weird behaviour of UDF mounting procedure. To get UID
changed (for now) we have to type
mount -t udf -o uid=some_user,uid=ignore /dev/device /mnt/moun_point
and specifying two uid at once is strange a bit. So with the patch we are
able to mount without additional 'uid=ignore' option. The same for GID
option is done.
This patch will not break current mount scheme (with two option).
Btw this does fix (I hope) the following
[BUG 6124] mount of UDF fs ignores UID and GID options
http://bugzilla.kernel.org/show_bug.cgi?id=6124
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Jan Kara <jack@ucw.cz>
Cc: Michael <auslands-kv@gmx.de>
Cc: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
136 lines
5.3 KiB
C
136 lines
5.3 KiB
C
#ifndef __LINUX_UDF_SB_H
|
|
#define __LINUX_UDF_SB_H
|
|
|
|
/* Since UDF 2.01 is ISO 13346 based... */
|
|
#define UDF_SUPER_MAGIC 0x15013346
|
|
|
|
#define UDF_MAX_READ_VERSION 0x0201
|
|
#define UDF_MAX_WRITE_VERSION 0x0201
|
|
|
|
#define UDF_FLAG_USE_EXTENDED_FE 0
|
|
#define UDF_VERS_USE_EXTENDED_FE 0x0200
|
|
#define UDF_FLAG_USE_STREAMS 1
|
|
#define UDF_VERS_USE_STREAMS 0x0200
|
|
#define UDF_FLAG_USE_SHORT_AD 2
|
|
#define UDF_FLAG_USE_AD_IN_ICB 3
|
|
#define UDF_FLAG_USE_FILE_CTIME_EA 4
|
|
#define UDF_FLAG_STRICT 5
|
|
#define UDF_FLAG_UNDELETE 6
|
|
#define UDF_FLAG_UNHIDE 7
|
|
#define UDF_FLAG_VARCONV 8
|
|
#define UDF_FLAG_NLS_MAP 9
|
|
#define UDF_FLAG_UTF8 10
|
|
#define UDF_FLAG_UID_FORGET 11 /* save -1 for uid to disk */
|
|
#define UDF_FLAG_UID_IGNORE 12 /* use sb uid instead of on disk uid */
|
|
#define UDF_FLAG_GID_FORGET 13
|
|
#define UDF_FLAG_GID_IGNORE 14
|
|
#define UDF_FLAG_UID_SET 15
|
|
#define UDF_FLAG_GID_SET 16
|
|
|
|
#define UDF_PART_FLAG_UNALLOC_BITMAP 0x0001
|
|
#define UDF_PART_FLAG_UNALLOC_TABLE 0x0002
|
|
#define UDF_PART_FLAG_FREED_BITMAP 0x0004
|
|
#define UDF_PART_FLAG_FREED_TABLE 0x0008
|
|
#define UDF_PART_FLAG_READ_ONLY 0x0010
|
|
#define UDF_PART_FLAG_WRITE_ONCE 0x0020
|
|
#define UDF_PART_FLAG_REWRITABLE 0x0040
|
|
#define UDF_PART_FLAG_OVERWRITABLE 0x0080
|
|
|
|
static inline struct udf_sb_info *UDF_SB(struct super_block *sb)
|
|
{
|
|
return sb->s_fs_info;
|
|
}
|
|
|
|
#define UDF_SB_FREE(X)\
|
|
{\
|
|
if (UDF_SB(X)) {\
|
|
kfree(UDF_SB_PARTMAPS(X));\
|
|
UDF_SB_PARTMAPS(X) = NULL;\
|
|
}\
|
|
}
|
|
|
|
#define UDF_SB_ALLOC_PARTMAPS(X,Y)\
|
|
{\
|
|
UDF_SB_PARTMAPS(X) = kmalloc(sizeof(struct udf_part_map) * Y, GFP_KERNEL);\
|
|
if (UDF_SB_PARTMAPS(X) != NULL) {\
|
|
UDF_SB_NUMPARTS(X) = Y;\
|
|
memset(UDF_SB_PARTMAPS(X), 0x00, sizeof(struct udf_part_map) * Y);\
|
|
} else {\
|
|
UDF_SB_NUMPARTS(X) = 0;\
|
|
udf_error(X, __FUNCTION__, "Unable to allocate space for %d partition maps", Y);\
|
|
}\
|
|
}
|
|
|
|
#define UDF_SB_ALLOC_BITMAP(X,Y,Z)\
|
|
{\
|
|
int nr_groups = ((UDF_SB_PARTLEN((X),(Y)) + (sizeof(struct spaceBitmapDesc) << 3) +\
|
|
((X)->s_blocksize * 8) - 1) / ((X)->s_blocksize * 8));\
|
|
int size = sizeof(struct udf_bitmap) + (sizeof(struct buffer_head *) * nr_groups);\
|
|
if (size <= PAGE_SIZE)\
|
|
UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap = kmalloc(size, GFP_KERNEL);\
|
|
else\
|
|
UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap = vmalloc(size);\
|
|
if (UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap != NULL) {\
|
|
memset(UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap, 0x00, size);\
|
|
UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap->s_block_bitmap =\
|
|
(struct buffer_head **)(UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap + 1);\
|
|
UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap->s_nr_groups = nr_groups;\
|
|
} else {\
|
|
udf_error(X, __FUNCTION__, "Unable to allocate space for bitmap and %d buffer_head pointers", nr_groups);\
|
|
}\
|
|
}
|
|
|
|
#define UDF_SB_FREE_BITMAP(X,Y,Z)\
|
|
{\
|
|
int i;\
|
|
int nr_groups = UDF_SB_BITMAP_NR_GROUPS(X,Y,Z);\
|
|
int size = sizeof(struct udf_bitmap) + (sizeof(struct buffer_head *) * nr_groups);\
|
|
for (i = 0; i < nr_groups; i++) {\
|
|
if (UDF_SB_BITMAP(X,Y,Z,i))\
|
|
brelse(UDF_SB_BITMAP(X,Y,Z,i));\
|
|
}\
|
|
if (size <= PAGE_SIZE)\
|
|
kfree(UDF_SB_PARTMAPS(X)[Y].Z.s_bitmap);\
|
|
else\
|
|
vfree(UDF_SB_PARTMAPS(X)[Y].Z.s_bitmap);\
|
|
}
|
|
|
|
#define UDF_QUERY_FLAG(X,Y) ( UDF_SB(X)->s_flags & ( 1 << (Y) ) )
|
|
#define UDF_SET_FLAG(X,Y) ( UDF_SB(X)->s_flags |= ( 1 << (Y) ) )
|
|
#define UDF_CLEAR_FLAG(X,Y) ( UDF_SB(X)->s_flags &= ~( 1 << (Y) ) )
|
|
|
|
#define UDF_UPDATE_UDFREV(X,Y) ( ((Y) > UDF_SB_UDFREV(X)) ? UDF_SB_UDFREV(X) = (Y) : UDF_SB_UDFREV(X) )
|
|
|
|
#define UDF_SB_PARTMAPS(X) ( UDF_SB(X)->s_partmaps )
|
|
#define UDF_SB_PARTTYPE(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_partition_type )
|
|
#define UDF_SB_PARTROOT(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_partition_root )
|
|
#define UDF_SB_PARTLEN(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_partition_len )
|
|
#define UDF_SB_PARTVSN(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_volumeseqnum )
|
|
#define UDF_SB_PARTNUM(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_partition_num )
|
|
#define UDF_SB_TYPESPAR(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_type_specific.s_sparing )
|
|
#define UDF_SB_TYPEVIRT(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_type_specific.s_virtual )
|
|
#define UDF_SB_PARTFUNC(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_partition_func )
|
|
#define UDF_SB_PARTFLAGS(X,Y) ( UDF_SB_PARTMAPS(X)[(Y)].s_partition_flags )
|
|
#define UDF_SB_BITMAP(X,Y,Z,I) ( UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap->s_block_bitmap[I] )
|
|
#define UDF_SB_BITMAP_NR_GROUPS(X,Y,Z) ( UDF_SB_PARTMAPS(X)[(Y)].Z.s_bitmap->s_nr_groups )
|
|
|
|
#define UDF_SB_VOLIDENT(X) ( UDF_SB(X)->s_volident )
|
|
#define UDF_SB_NUMPARTS(X) ( UDF_SB(X)->s_partitions )
|
|
#define UDF_SB_PARTITION(X) ( UDF_SB(X)->s_partition )
|
|
#define UDF_SB_SESSION(X) ( UDF_SB(X)->s_session )
|
|
#define UDF_SB_ANCHOR(X) ( UDF_SB(X)->s_anchor )
|
|
#define UDF_SB_LASTBLOCK(X) ( UDF_SB(X)->s_lastblock )
|
|
#define UDF_SB_LVIDBH(X) ( UDF_SB(X)->s_lvidbh )
|
|
#define UDF_SB_LVID(X) ( (struct logicalVolIntegrityDesc *)UDF_SB_LVIDBH(X)->b_data )
|
|
#define UDF_SB_LVIDIU(X) ( (struct logicalVolIntegrityDescImpUse *)&(UDF_SB_LVID(X)->impUse[le32_to_cpu(UDF_SB_LVID(X)->numOfPartitions) * 2 * sizeof(uint32_t)/sizeof(uint8_t)]) )
|
|
|
|
#define UDF_SB_UMASK(X) ( UDF_SB(X)->s_umask )
|
|
#define UDF_SB_GID(X) ( UDF_SB(X)->s_gid )
|
|
#define UDF_SB_UID(X) ( UDF_SB(X)->s_uid )
|
|
#define UDF_SB_RECORDTIME(X) ( UDF_SB(X)->s_recordtime )
|
|
#define UDF_SB_SERIALNUM(X) ( UDF_SB(X)->s_serialnum )
|
|
#define UDF_SB_UDFREV(X) ( UDF_SB(X)->s_udfrev )
|
|
#define UDF_SB_FLAGS(X) ( UDF_SB(X)->s_flags )
|
|
#define UDF_SB_VAT(X) ( UDF_SB(X)->s_vat )
|
|
|
|
#endif /* __LINUX_UDF_SB_H */
|