UBUNTU: SAUCE: (noup) Update spl to 0.6.5.9-1ubuntu2, zfs to 0.6.5.9-5ubuntu7

[mirror_ubuntu-artful-kernel.git] / zfs / module / zfs / zpl_xattr.c

diff --git a/zfs/module/zfs/zpl_xattr.c b/zfs/module/zfs/zpl_xattr.c
index 58962076d6c8bd3759abec0b8b3e0b1ebeae2d44..b74b53a0e1354327ac37ab4d4030955a7414d600 100644 (file)
--- a/zfs/module/zfs/zpl_xattr.c
+++ b/zfs/module/zfs/zpl_xattr.c
@@ -938,7 +938,6 @@ xattr_handler_t zpl_xattr_security_handler = {
 int
 zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type)
 {
-       struct super_block *sb = ITOZSB(ip)->z_sb;
        char *name, *value = NULL;
        int error = 0;
        size_t size = 0;
@@ -964,7 +963,7 @@ zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type)
                                 */
                                if (ip->i_mode != mode) {
                                        ip->i_mode = mode;
-                                       ip->i_ctime = current_fs_time(sb);
+                                       ip->i_ctime = current_time(ip);
                                        zfs_mark_inode_dirty(ip);
                                }
 
@@ -1130,7 +1129,7 @@ zpl_init_acl(struct inode *ip, struct inode *dir)
 
                if (!acl) {
                        ip->i_mode &= ~current_umask();
-                       ip->i_ctime = current_fs_time(ITOZSB(ip)->z_sb);
+                       ip->i_ctime = current_time(ip);
                        zfs_mark_inode_dirty(ip);
                        return (0);
                }