mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull quota, ext2, isofs and udf fixes from Jan Kara: - two small quota error handling fixes - two isofs fixes for architectures with signed char - several udf block number overflow and signedness fixes - ext2 rework of mount option handling to avoid GFP_KERNEL allocation with spinlock held - ... it also contains a patch to implement auditing of responses to fanotify permission events. That should have been in the fanotify pull request but I mistakenly merged that patch into a wrong branch and noticed only now at which point I don't think it's worth rebasing and redoing. * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: quota: be aware of error from dquot_initialize quota: fix potential infinite loop isofs: use unsigned char types consistently isofs: fix timestamps beyond 2027 udf: Fix some sign-conversion warnings udf: Fix signed/unsigned format specifiers udf: Fix 64-bit sign extension issues affecting blocks > 0x7FFFFFFF udf: Remove some outdate references from documentation udf: Avoid overflow when session starts at large offset ext2: Fix possible sleep in atomic during mount option parsing ext2: Parse mount options into a dedicated structure audit: Record fanotify access control decisions
This commit is contained in:
commit
f14fc0ccee
27 changed files with 366 additions and 314 deletions
|
|
@ -73,41 +73,41 @@ static inline struct iso_inode_info *ISOFS_I(struct inode *inode)
|
|||
return container_of(inode, struct iso_inode_info, vfs_inode);
|
||||
}
|
||||
|
||||
static inline int isonum_711(char *p)
|
||||
static inline int isonum_711(u8 *p)
|
||||
{
|
||||
return *(u8 *)p;
|
||||
return *p;
|
||||
}
|
||||
static inline int isonum_712(char *p)
|
||||
static inline int isonum_712(s8 *p)
|
||||
{
|
||||
return *(s8 *)p;
|
||||
return *p;
|
||||
}
|
||||
static inline unsigned int isonum_721(char *p)
|
||||
static inline unsigned int isonum_721(u8 *p)
|
||||
{
|
||||
return get_unaligned_le16(p);
|
||||
}
|
||||
static inline unsigned int isonum_722(char *p)
|
||||
static inline unsigned int isonum_722(u8 *p)
|
||||
{
|
||||
return get_unaligned_be16(p);
|
||||
}
|
||||
static inline unsigned int isonum_723(char *p)
|
||||
static inline unsigned int isonum_723(u8 *p)
|
||||
{
|
||||
/* Ignore bigendian datum due to broken mastering programs */
|
||||
return get_unaligned_le16(p);
|
||||
}
|
||||
static inline unsigned int isonum_731(char *p)
|
||||
static inline unsigned int isonum_731(u8 *p)
|
||||
{
|
||||
return get_unaligned_le32(p);
|
||||
}
|
||||
static inline unsigned int isonum_732(char *p)
|
||||
static inline unsigned int isonum_732(u8 *p)
|
||||
{
|
||||
return get_unaligned_be32(p);
|
||||
}
|
||||
static inline unsigned int isonum_733(char *p)
|
||||
static inline unsigned int isonum_733(u8 *p)
|
||||
{
|
||||
/* Ignore bigendian datum due to broken mastering programs */
|
||||
return get_unaligned_le32(p);
|
||||
}
|
||||
extern int iso_date(char *, int);
|
||||
extern int iso_date(u8 *, int);
|
||||
|
||||
struct inode; /* To make gcc happy */
|
||||
|
||||
|
|
|
|||
|
|
@ -7,78 +7,78 @@
|
|||
*/
|
||||
|
||||
struct SU_SP_s {
|
||||
unsigned char magic[2];
|
||||
unsigned char skip;
|
||||
__u8 magic[2];
|
||||
__u8 skip;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct SU_CE_s {
|
||||
char extent[8];
|
||||
char offset[8];
|
||||
char size[8];
|
||||
__u8 extent[8];
|
||||
__u8 offset[8];
|
||||
__u8 size[8];
|
||||
};
|
||||
|
||||
struct SU_ER_s {
|
||||
unsigned char len_id;
|
||||
unsigned char len_des;
|
||||
unsigned char len_src;
|
||||
unsigned char ext_ver;
|
||||
char data[0];
|
||||
__u8 len_id;
|
||||
__u8 len_des;
|
||||
__u8 len_src;
|
||||
__u8 ext_ver;
|
||||
__u8 data[0];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct RR_RR_s {
|
||||
char flags[1];
|
||||
__u8 flags[1];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct RR_PX_s {
|
||||
char mode[8];
|
||||
char n_links[8];
|
||||
char uid[8];
|
||||
char gid[8];
|
||||
__u8 mode[8];
|
||||
__u8 n_links[8];
|
||||
__u8 uid[8];
|
||||
__u8 gid[8];
|
||||
};
|
||||
|
||||
struct RR_PN_s {
|
||||
char dev_high[8];
|
||||
char dev_low[8];
|
||||
__u8 dev_high[8];
|
||||
__u8 dev_low[8];
|
||||
};
|
||||
|
||||
struct SL_component {
|
||||
unsigned char flags;
|
||||
unsigned char len;
|
||||
char text[0];
|
||||
__u8 flags;
|
||||
__u8 len;
|
||||
__u8 text[0];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct RR_SL_s {
|
||||
unsigned char flags;
|
||||
__u8 flags;
|
||||
struct SL_component link;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct RR_NM_s {
|
||||
unsigned char flags;
|
||||
__u8 flags;
|
||||
char name[0];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct RR_CL_s {
|
||||
char location[8];
|
||||
__u8 location[8];
|
||||
};
|
||||
|
||||
struct RR_PL_s {
|
||||
char location[8];
|
||||
__u8 location[8];
|
||||
};
|
||||
|
||||
struct stamp {
|
||||
char time[7];
|
||||
__u8 time[7]; /* actually 6 unsigned, 1 signed */
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct RR_TF_s {
|
||||
char flags;
|
||||
__u8 flags;
|
||||
struct stamp times[0]; /* Variable number of these beasts */
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* Linux-specific extension for transparent decompression */
|
||||
struct RR_ZF_s {
|
||||
char algorithm[2];
|
||||
char parms[2];
|
||||
char real_size[8];
|
||||
__u8 algorithm[2];
|
||||
__u8 parms[2];
|
||||
__u8 real_size[8];
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -94,9 +94,9 @@ struct RR_ZF_s {
|
|||
#define TF_LONG_FORM 128
|
||||
|
||||
struct rock_ridge {
|
||||
char signature[2];
|
||||
unsigned char len;
|
||||
unsigned char version;
|
||||
__u8 signature[2];
|
||||
__u8 len;
|
||||
__u8 version;
|
||||
union {
|
||||
struct SU_SP_s SP;
|
||||
struct SU_CE_s CE;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* to GMT. Thus we should always be correct.
|
||||
*/
|
||||
|
||||
int iso_date(char * p, int flag)
|
||||
int iso_date(u8 *p, int flag)
|
||||
{
|
||||
int year, month, day, hour, minute, second, tz;
|
||||
int crtime;
|
||||
|
|
|
|||
Loading…
Reference in a new issue