diff options
Diffstat (limited to 'sys-apps/acl/files/0003-NFSv4-POSIX-mapping-clean-up-loop-interation.patch')
| -rw-r--r-- | sys-apps/acl/files/0003-NFSv4-POSIX-mapping-clean-up-loop-interation.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/sys-apps/acl/files/0003-NFSv4-POSIX-mapping-clean-up-loop-interation.patch b/sys-apps/acl/files/0003-NFSv4-POSIX-mapping-clean-up-loop-interation.patch deleted file mode 100644 index 34e6ce2..0000000 --- a/sys-apps/acl/files/0003-NFSv4-POSIX-mapping-clean-up-loop-interation.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 2710403cf7742fd6f919977df4da4797625c4407 Mon Sep 17 00:00:00 2001 -From: "J. Bruce Fields" <bfields@snoopy.citi.umich.edu> -Date: Tue, 12 Dec 2006 16:41:12 -0500 -Subject: [PATCH 03/17] NFSv4->POSIX mapping: clean up loop interation - -Clean up slightly over-complicated iteration here. ---- - libacl/acl_n4tp_acl_trans.c | 16 ++-------------- - 1 files changed, 2 insertions(+), 14 deletions(-) - -diff --git a/libacl/acl_n4tp_acl_trans.c b/libacl/acl_n4tp_acl_trans.c -index 7fcb992..0e505c4 100644 ---- a/libacl/acl_n4tp_acl_trans.c -+++ b/libacl/acl_n4tp_acl_trans.c -@@ -353,7 +353,6 @@ acl_t acl_n4tp_acl_trans(struct nfs4_acl * nacl_p, acl_type_t ptype) - acl_t pacl; - struct nfs4_acl * temp_acl; - int num_aces; -- int ace_num; - struct nfs4_ace * cur_ace = NULL; - struct nfs4_ace * temp_ace = NULL; - int ret; -@@ -384,23 +383,14 @@ acl_t acl_n4tp_acl_trans(struct nfs4_acl * nacl_p, acl_type_t ptype) - /* Strip or keep inheritance aces depending upon the type of posix acl - * requested */ - cur_ace = temp_acl->ace_head.tqh_first; -- ace_num = 1; -- -- while (1) { -- if (cur_ace == NULL) { -- if (ace_num > num_aces) -- break; -- else -- goto free_failed; -- } - -- /* get the next ace now because we may be freeing the current ace */ -+ while (cur_ace) { -+ /* get the next ace now in case we free the current ace */ - temp_ace = cur_ace; - cur_ace = cur_ace->l_ace.tqe_next; - - flags = temp_ace->flag; - -- /* XXX: bring in sync with current kernel: */ - if (iflags & NFS4_ACL_REQUEST_DEFAULT) { - if((flags & NFS4_INHERITANCE_FLAGS) != NFS4_INHERITANCE_FLAGS) - acl_nfs4_remove_ace(temp_acl, temp_ace); -@@ -409,8 +399,6 @@ acl_t acl_n4tp_acl_trans(struct nfs4_acl * nacl_p, acl_type_t ptype) - acl_nfs4_remove_ace(temp_acl, temp_ace); - } - } -- -- ace_num++; - } - - ret = init_state(&state, temp_acl->naces); --- -1.7.8.1 - |