From a4f27db0fb56bfcff76fd698ca4d8d4b76898a29 Mon Sep 17 00:00:00 2001 From: John Johansen Date: Thu, 22 Mar 2012 10:13:52 -0700 Subject: UBUNTU: SAUCE: Update aufs for build failure caused by apparmor backport 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 Signed-off-by: Tim Gardner --- ubuntu/aufs/i_op.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ubuntu/aufs/i_op.c b/ubuntu/aufs/i_op.c index fb0e646474e..ec50afd99ef 100644 --- a/ubuntu/aufs/i_op.c +++ b/ubuntu/aufs/i_op.c @@ -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)) -- cgit v1.2.3