diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-20 12:16:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-20 12:16:40 +0800 |
| commit | 023861726fc0899139add9dd47905b8de7644257 (patch) | |
| tree | 5bf6b578027b3d9910da0d99f01eaf5cfa0a5e02 /fs/ocfs2/xattr.h | |
| parent | b3f09bff3f6f291d4ef5d400426278856bf24c27 (diff) | |
| parent | 510d0a3f869611dcd001a2b7627fa5dded4579af (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-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 */ |