Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / jffs2 / acl.c

diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 2a0f2a1..7ebacf1 100644 (file)
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -243,7 +243,7 @@ int jffs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 
                                attr.ia_valid = ATTR_MODE | ATTR_CTIME;
                                attr.ia_mode = mode;
-                               attr.ia_ctime = CURRENT_TIME_SEC;
+                               attr.ia_ctime = current_time(inode);
                                rc = jffs2_do_setattr(inode, &attr);
                                if (rc < 0)
                                        return rc;