UBUNTU: SAUCE: Update aufs for build failure caused by apparmor backport
authorJohn Johansen <john.johansen@canonical.com>
Thu, 22 Mar 2012 17:13:52 +0000 (10:13 -0700)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 2 Apr 2012 20:24:03 +0000 (13:24 -0700)
Fix build failure in aufs introduced by

  commit 9cd98c046b57cd1bdbd53c3669f6cdd75edffd61

which has been backported from 3.4 as part of the AppArmor 3.4 backport

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

ubuntu/aufs/i_op.c

index fb0e646..ec50afd 100644 (file)
@@ -697,8 +697,7 @@ static int aufs_setattr(struct dentry *dentry, struct iattr *ia)
        a->h_path.mnt = au_sbr_mnt(sb, a->btgt);
        if ((ia->ia_valid & (ATTR_MODE | ATTR_CTIME))
            == (ATTR_MODE | ATTR_CTIME)) {
-               err = security_path_chmod(a->h_path.dentry, a->h_path.mnt,
-                                         ia->ia_mode);
+               err = security_path_chmod(&a->h_path, ia->ia_mode);
                if (unlikely(err))
                        goto out_unlock;
        } else if ((ia->ia_valid & (ATTR_UID | ATTR_GID))