MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-22 23:13:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

\n

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEq1nRK9aeMoq1VSgcnJ2qBz9kQNkFAmg4dh4ACgkQnJ2qBz9k
 QNkjcAgA2iI2lr5N4evrF8GCFAFWgHrCtddDWbHZ4MZuRiboB+IyAQbdcYftks/7
 GCKoUxXKXm05D/qwKErPzFU1xtCWUqlHSdjI0BPA1P4HqyIBHA7VwB03MmlIK39H
 BbBtY4GcmLM7dJ+rrjhFDqj5Uu/cyk3bMEZFS8MA8mz8WJ0Izc8iFn/UMH+LCFxF
 spkykB+qNDuztR9zr0OM44ef/jbkvTvPX02QP1WEnzCffGBYvBBDN9YJm7ZRLZCN
 +NP0wUM2to09oYfI6iylQZd9h4gExs8G08EsuTtZvjiJtLpip+0g6CcSUaDT2/tw
 3o6fgN/H24TgiDGzOo+R+jKdN9WKqA==
 =1gmE
 -----END PGP SIGNATURE-----

Merge tag 'fs_for_v6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull ext2 and isofs updates from Jan Kara:

 - isofs fix of handling of particularly formatted Rock Ridge timestamps

 - Add deprecation notice about support of DAX in ext2 filesystem driver

* tag 'fs_for_v6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext2: Deprecate DAX
  isofs: fix Y2038 and Y2156 issues in Rock Ridge TF entry
This commit is contained in:
Linus Torvalds 2025-05-29 10:38:23 -07:00
commit e0797d3b91
6 changed files with 67 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ext2/super.c
View File

@ -601,7 +601,8 @@ static int ext2_parse_param(struct fs_context *fc, struct fs_parameter *param)
case Opt_dax:
#ifdef CONFIG_FS_DAX
ext2_msg_fc(fc, KERN_WARNING,
"DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
"DAX enabled. Warning: DAX support in ext2 driver is deprecated"
" and will be removed at the end of 2025. Please use ext4 driver instead.");
ctx_set_mount_opt(ctx, EXT2_MOUNT_DAX);
#else
ext2_msg_fc(fc, KERN_INFO, "dax option not supported");

7
fs/isofs/inode.c
View File

@ -1275,6 +1275,7 @@ static int isofs_read_inode(struct inode *inode, int relocated)
unsigned long offset;
struct iso_inode_info *ei = ISOFS_I(inode);
int ret = -EIO;
struct timespec64 ts;
block = ei->i_iget5_block;
bh = sb_bread(inode->i_sb, block);
@ -1387,8 +1388,10 @@ static int isofs_read_inode(struct inode *inode, int relocated)
inode->i_ino, de->flags[-high_sierra]);
}
#endif
inode_set_mtime_to_ts(inode,
inode_set_atime_to_ts(inode, inode_set_ctime(inode, iso_date(de->date, high_sierra), 0)));
ts = iso_date(de->date, high_sierra ? ISO_DATE_HIGH_SIERRA : 0);
inode_set_ctime_to_ts(inode, ts);
inode_set_atime_to_ts(inode, ts);
inode_set_mtime_to_ts(inode, ts);
ei->i_first_extent = (isonum_733(de->extent) +
isonum_711(de->ext_attr_length));

4
fs/isofs/isofs.h
View File

@ -106,7 +106,9 @@ 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(u8 *, int);
#define ISO_DATE_HIGH_SIERRA (1 << 0)
#define ISO_DATE_LONG_FORM (1 << 1)
struct timespec64 iso_date(u8 *p, int flags);
struct inode; /* To make gcc happy */

40
fs/isofs/rock.c
View File

@ -412,7 +412,12 @@ repeat:
}
}
break;
case SIG('T', 'F'):
case SIG('T', 'F'): {
int flags, size, slen;
flags = rr->u.TF.flags & TF_LONG_FORM ? ISO_DATE_LONG_FORM : 0;
size = rr->u.TF.flags & TF_LONG_FORM ? 17 : 7;
slen = rr->len - 5;
/*
* Some RRIP writers incorrectly place ctime in the
* TF_CREATE field. Try to handle this correctly for
@ -420,27 +425,28 @@ repeat:
*/
/* Rock ridge never appears on a High Sierra disk */
cnt = 0;
if (rr->u.TF.flags & TF_CREATE) {
inode_set_ctime(inode,
iso_date(rr->u.TF.times[cnt++].time, 0),
0);
if ((rr->u.TF.flags & TF_CREATE) && size <= slen) {
inode_set_ctime_to_ts(inode,
iso_date(rr->u.TF.data + size * cnt++, flags));
slen -= size;
}
if (rr->u.TF.flags & TF_MODIFY) {
inode_set_mtime(inode,
iso_date(rr->u.TF.times[cnt++].time, 0),
0);
if ((rr->u.TF.flags & TF_MODIFY) && size <= slen) {
inode_set_mtime_to_ts(inode,
iso_date(rr->u.TF.data + size * cnt++, flags));
slen -= size;
}
if (rr->u.TF.flags & TF_ACCESS) {
inode_set_atime(inode,
iso_date(rr->u.TF.times[cnt++].time, 0),
0);
if ((rr->u.TF.flags & TF_ACCESS) && size <= slen) {
inode_set_atime_to_ts(inode,
iso_date(rr->u.TF.data + size * cnt++, flags));
slen -= size;
}
if (rr->u.TF.flags & TF_ATTRIBUTES) {
inode_set_ctime(inode,
iso_date(rr->u.TF.times[cnt++].time, 0),
0);
if ((rr->u.TF.flags & TF_ATTRIBUTES) && size <= slen) {
inode_set_ctime_to_ts(inode,
iso_date(rr->u.TF.data + size * cnt++, flags));
slen -= size;
}
break;
}
case SIG('S', 'L'):
{
int slen;

6
fs/isofs/rock.h
View File

@ -65,13 +65,9 @@ struct RR_PL_s {
__u8 location[8];
};
struct stamp {
__u8 time[7]; /* actually 6 unsigned, 1 signed */
} __attribute__ ((packed));
struct RR_TF_s {
__u8 flags;
struct stamp times[]; /* Variable number of these beasts */
__u8 data[];
} __attribute__ ((packed));
/* Linux-specific extension for transparent decompression */

51
fs/isofs/util.c
View File

@ -16,29 +16,44 @@
* to GMT. Thus we should always be correct.
*/
int iso_date(u8 *p, int flag)
struct timespec64 iso_date(u8 *p, int flags)
{
int year, month, day, hour, minute, second, tz;
int crtime;
struct timespec64 ts;
year = p[0];
month = p[1];
day = p[2];
hour = p[3];
minute = p[4];
second = p[5];
if (flag == 0) tz = p[6]; /* High sierra has no time zone */
else tz = 0;
if (year < 0) {
crtime = 0;
if (flags & ISO_DATE_LONG_FORM) {
year = (p[0] - '0') * 1000 +
(p[1] - '0') * 100 +
(p[2] - '0') * 10 +
(p[3] - '0') - 1900;
month = ((p[4] - '0') * 10 + (p[5] - '0'));
day = ((p[6] - '0') * 10 + (p[7] - '0'));
hour = ((p[8] - '0') * 10 + (p[9] - '0'));
minute = ((p[10] - '0') * 10 + (p[11] - '0'));
second = ((p[12] - '0') * 10 + (p[13] - '0'));
ts.tv_nsec = ((p[14] - '0') * 10 + (p[15] - '0')) * 10000000;
tz = p[16];
} else {
crtime = mktime64(year+1900, month, day, hour, minute, second);
year = p[0];
month = p[1];
day = p[2];
hour = p[3];
minute = p[4];
second = p[5];
ts.tv_nsec = 0;
/* High sierra has no time zone */
tz = flags & ISO_DATE_HIGH_SIERRA ? 0 : p[6];
}
if (year < 0) {
ts.tv_sec = 0;
} else {
ts.tv_sec = mktime64(year+1900, month, day, hour, minute, second);
/* sign extend */
if (tz & 0x80)
tz |= (-1 << 8);
/*
* The timezone offset is unreliable on some disks,
* so we make a sanity check. In no case is it ever
@ -65,7 +80,7 @@ int iso_date(u8 *p, int flag)
* for pointing out the sign error.
*/
if (-52 <= tz && tz <= 52)
crtime -= tz * 15 * 60;
ts.tv_sec -= tz * 15 * 60;
}
return crtime;
}
return ts;
}