Commit 92ebf5f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'erofs-for-5.17-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs 

Pull erofs fix from Gao Xiang:
 "A one-line patch to fix the new ztailpacking feature on > 4GiB
  filesystems because z_idataoff can get trimmed improperly.

  ztailpacking is still a brand new EXPERIMENTAL feature, but it'd be
  better to fix the issue as soon as possible to avoid unnecessary
  backporting.

  Summary:

   - Fix ztailpacking z_idataoff getting trimmed on > 4GiB filesystems"

* tag 'erofs-for-5.17-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
  erofs: fix ztailpacking on > 4GiB filesystems
parents ae5f531d 22ba5e99

fs/erofs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ struct erofs_inode { 
			unsigned char  z_algorithmtype[2];

			unsigned char  z_logical_clusterbits;

			unsigned long  z_tailextent_headlcn;

			unsigned int   z_idataoff;

			erofs_off_t    z_idataoff;

			unsigned short z_idata_size;

		};

#endif	/* CONFIG_EROFS_FS_ZIP */