diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:16 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:16 +0800 |
| commit | 1d48c75353cb265710f7589f47532e1db06cb64f (patch) | |
| tree | ebfded7d10d45cfb718c76159de227b593716d5c /fs/ocfs2/xattr.h | |
| parent | 71d97a95427b3c9c11788a8e6dd0117551d29166 (diff) | |
| parent | 0a296a966f183e4ef1fcb37940940e8df8c4f258 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.05-android
Diffstat (limited to 'fs/ocfs2/xattr.h')
| -rw-r--r-- | fs/ocfs2/xattr.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ocfs2/xattr.h b/fs/ocfs2/xattr.h index f10d5b93c366..1633cc15ea1f 100644 --- a/fs/ocfs2/xattr.h +++ b/fs/ocfs2/xattr.h @@ -94,7 +94,5 @@ int ocfs2_reflink_xattrs(struct inode *old_inode, bool preserve_security); int ocfs2_init_security_and_acl(struct inode *dir, struct inode *inode, - const struct qstr *qstr, - struct posix_acl *default_acl, - struct posix_acl *acl); + const struct qstr *qstr); #endif /* OCFS2_XATTR_H */ |