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

Commit 73d28d57 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

fs/hfsplus: atomically set inode->i_flags 



According to commit 5f16f322 ("ext4: atomically set inode->i_flags in
ext4_set_inode_flags()").

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5e61473e

fs/hfsplus/ioctl.c

+5 −7
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int hfsplus_ioctl_setflags(struct file *file, int __user *user_flags) 
{

	struct inode *inode = file_inode(file);

	struct hfsplus_inode_info *hip = HFSPLUS_I(inode);

	unsigned int flags;

	unsigned int flags, new_fl = 0;

	int err = 0;



	err = mnt_want_write_file(file);
@@ -110,14 +110,12 @@ static int hfsplus_ioctl_setflags(struct file *file, int __user *user_flags) 
	}



	if (flags & FS_IMMUTABLE_FL)

		inode->i_flags |= S_IMMUTABLE;

	else

		inode->i_flags &= ~S_IMMUTABLE;

		new_fl |= S_IMMUTABLE;



	if (flags & FS_APPEND_FL)

		inode->i_flags |= S_APPEND;

	else

		inode->i_flags &= ~S_APPEND;

		new_fl |= S_APPEND;



	inode_set_flags(inode, new_fl, S_IMMUTABLE | S_APPEND);



	if (flags & FS_NODUMP_FL)

		hip->userflags |= HFSPLUS_FLG_NODUMP;