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

Commit 341bbdc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'jfs-3.14-rc4' of git://github.com/kleikamp/linux-shaggy

Pull jfs fix from David Kleikamp:
 "Another ACL regression. This one more subtle"

* tag 'jfs-3.14-rc4' of git://github.com/kleikamp/linux-shaggy:
  jfs: set i_ctime when setting ACL
parents 805937cf 844fa1b5
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,8 @@ static int __jfs_set_acl(tid_t tid, struct inode *inode, int type,
		rc = posix_acl_equiv_mode(acl, &inode->i_mode);
		rc = posix_acl_equiv_mode(acl, &inode->i_mode);
		if (rc < 0)
		if (rc < 0)
			return rc;
			return rc;
		inode->i_ctime = CURRENT_TIME;
		mark_inode_dirty(inode);
		if (rc == 0)
		if (rc == 0)
			acl = NULL;
			acl = NULL;
		break;
		break;