Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39a50b42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hfsplus' 

Merge hfsplus fixes from Christoph Hellwig:
 "Two small hfsplus fixes:

   - a one liner regression fix for large volume handling from Janne
     Kalliomäki.
   - a fixup for the boot image blessing feature to make it work with
     the fake "hardlinks" in hfsplus from Matthew Garrett."

* branch 'hfsplus':
  hfsplus: fix bless ioctl when used with hardlinks
  hfsplus: fix overflow in sector calculations in hfsplus_submit_bio
parents fb09185a 7dea9665

fs/hfsplus/ioctl.c

+7 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ static int hfsplus_ioctl_bless(struct file *file, int __user *user_flags) 
	struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb);

	struct hfsplus_vh *vh = sbi->s_vhdr;

	struct hfsplus_vh *bvh = sbi->s_backup_vhdr;

	u32 cnid = (unsigned long)dentry->d_fsdata;



	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;
@@ -41,8 +42,12 @@ static int hfsplus_ioctl_bless(struct file *file, int __user *user_flags) 
	vh->finder_info[0] = bvh->finder_info[0] =

		cpu_to_be32(parent_ino(dentry));



	/* Bootloader */

	vh->finder_info[1] = bvh->finder_info[1] = cpu_to_be32(inode->i_ino);

	/*

	 * Bootloader. Just using the inode here breaks in the case of

	 * hard links - the firmware wants the ID of the hard link file,

	 * but the inode points at the indirect inode

	 */

	vh->finder_info[1] = bvh->finder_info[1] = cpu_to_be32(cnid);



	/* Per spec, the OS X system folder - same as finder_info[0] here */

	vh->finder_info[5] = bvh->finder_info[5] =

fs/hfsplus/wrapper.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector, 
	DECLARE_COMPLETION_ONSTACK(wait);

	struct bio *bio;

	int ret = 0;

	unsigned int io_size;

	u64 io_size;

	loff_t start;

	int offset;