Commit 99fa936e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'affs-6.14-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull affs fixes from David Sterba:
 "Two fixes from Simon Tatham. They're real bugfixes for problems with
  OFS floppy disks created on linux and then read in the emulated
  Workbench environment"

* tag 'affs-6.14-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  affs: don't write overlarge OFS data block size fields
  affs: generate OFS sequence numbers starting at 1
parents d9a9c94d 011ea742

fs/affs/file.c

+5 −4
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize) 
		BUG_ON(tmp > bsize);

		AFFS_DATA_HEAD(bh)->ptype = cpu_to_be32(T_DATA);

		AFFS_DATA_HEAD(bh)->key = cpu_to_be32(inode->i_ino);

		AFFS_DATA_HEAD(bh)->sequence = cpu_to_be32(bidx);

		AFFS_DATA_HEAD(bh)->sequence = cpu_to_be32(bidx + 1);

		AFFS_DATA_HEAD(bh)->size = cpu_to_be32(tmp);

		affs_fix_checksum(sb, bh);

		bh->b_state &= ~(1UL << BH_New);
@@ -724,7 +724,8 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, 
		tmp = min(bsize - boff, to - from);

		BUG_ON(boff + tmp > bsize || tmp > bsize);

		memcpy(AFFS_DATA(bh) + boff, data + from, tmp);

		be32_add_cpu(&AFFS_DATA_HEAD(bh)->size, tmp);

		AFFS_DATA_HEAD(bh)->size = cpu_to_be32(

			max(boff + tmp, be32_to_cpu(AFFS_DATA_HEAD(bh)->size)));

		affs_fix_checksum(sb, bh);

		mark_buffer_dirty_inode(bh, inode);

		written += tmp;
@@ -746,7 +747,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, 
		if (buffer_new(bh)) {

			AFFS_DATA_HEAD(bh)->ptype = cpu_to_be32(T_DATA);

			AFFS_DATA_HEAD(bh)->key = cpu_to_be32(inode->i_ino);

			AFFS_DATA_HEAD(bh)->sequence = cpu_to_be32(bidx);

			AFFS_DATA_HEAD(bh)->sequence = cpu_to_be32(bidx + 1);

			AFFS_DATA_HEAD(bh)->size = cpu_to_be32(bsize);

			AFFS_DATA_HEAD(bh)->next = 0;

			bh->b_state &= ~(1UL << BH_New);
@@ -780,7 +781,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping, 
		if (buffer_new(bh)) {

			AFFS_DATA_HEAD(bh)->ptype = cpu_to_be32(T_DATA);

			AFFS_DATA_HEAD(bh)->key = cpu_to_be32(inode->i_ino);

			AFFS_DATA_HEAD(bh)->sequence = cpu_to_be32(bidx);

			AFFS_DATA_HEAD(bh)->sequence = cpu_to_be32(bidx + 1);

			AFFS_DATA_HEAD(bh)->size = cpu_to_be32(tmp);

			AFFS_DATA_HEAD(bh)->next = 0;

			bh->b_state &= ~(1UL << BH_New);