fix compilation after merge

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / posix_acl.c

diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 567ad1f0e2d066678768b6d727e94f05d4bbc3a6..35cc1f40b82df52a0aa14ccb1830b7726c36463a 100644 (file)
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -438,37 +438,6 @@ posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
 }
 EXPORT_SYMBOL(posix_acl_create);
 
-/**
- * posix_acl_update_mode  -  update mode in set_acl
- *
- * Update the file mode when setting an ACL: compute the new file permission
- * bits based on the ACL.  In addition, if the ACL is equivalent to the new
- * file mode, set *acl to NULL to indicate that no ACL should be set.
- *
- * As with chmod, clear the setgit bit if the caller is not in the owning group
- * or capable of CAP_FSETID (see inode_change_ok).
- *
- * Called from set_acl inode operations.
- */
-int posix_acl_update_mode(struct inode *inode, umode_t *mode_p,
-                          struct posix_acl **acl)
-{
-        umode_t mode = inode->i_mode;
-        int error;
-
-        error = posix_acl_equiv_mode(*acl, &mode);
-        if (error < 0)
-                return error;
-        if (error == 0)
-                *acl = NULL;
-        if (!in_group_p(inode->i_gid) &&
-            !capable_wrt_inode_uidgid(inode, CAP_FSETID))
-                mode &= ~S_ISGID;
-        *mode_p = mode;
-        return 0;
-}
-EXPORT_SYMBOL(posix_acl_update_mode);
-
 int
 posix_acl_chmod(struct posix_acl **acl, gfp_t gfp, umode_t mode)
 {