diff options
| author | John Johansen <john.johansen@canonical.com> | 2012-03-22 10:13:52 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-06-25 15:04:05 -0600 |
| commit | 8463e8187da1e65c90bc85ef43855db187a1ded0 (patch) | |
| tree | 0261c29f89d21cd7f65d5b1350cf29550da5fcc8 | |
| parent | caff16a7487085c73f0563ee2ccd829626d948d2 (diff) | |
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 <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
| -rw-r--r-- | ubuntu/aufs/i_op.c | 3 |
1 files changed, 1 insertions, 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)) |