← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/jfs/xattr.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/jfs/xattr.c
678
678
        struct posix_acl *acl;
679
679
        int rc;
680
680
 
681
 
        if (!is_owner_or_cap(inode))
 
681
        if (!inode_owner_or_capable(inode))
682
682
                return -EPERM;
683
683
 
684
684
        /*
1091
1091
}
1092
1092
 
1093
1093
#ifdef CONFIG_JFS_SECURITY
1094
 
int jfs_init_security(tid_t tid, struct inode *inode, struct inode *dir)
 
1094
int jfs_init_security(tid_t tid, struct inode *inode, struct inode *dir,
 
1095
                      const struct qstr *qstr)
1095
1096
{
1096
1097
        int rc;
1097
1098
        size_t len;
1099
1100
        char *suffix;
1100
1101
        char *name;
1101
1102
 
1102
 
        rc = security_inode_init_security(inode, dir, &suffix, &value, &len);
 
1103
        rc = security_inode_init_security(inode, dir, qstr, &suffix, &value,
 
1104
                                          &len);
1103
1105
        if (rc) {
1104
1106
                if (rc == -EOPNOTSUPP)
1105
1107
                        return 0;