Commit 55982d94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  ext3: update ctime when changing the file's permission by setfacl
  ext2: update ctime when changing the file's permission by setfacl
parents a7b91725 30e2bab2

fs/ext2/acl.c

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl) 
					return error;

				else {

					inode->i_mode = mode;

					inode->i_ctime = CURRENT_TIME_SEC;

					mark_inode_dirty(inode);

					if (error == 0)

						acl = NULL;

fs/ext3/acl.c

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type, 
					return error;

				else {

					inode->i_mode = mode;

					inode->i_ctime = CURRENT_TIME_SEC;

					ext3_mark_inode_dirty(handle, inode);

					if (error == 0)

						acl = NULL;