setcifsacl: clean up get_numfaces

pntsd is never NULL here, and get rid of extra "else" that adds some
unneeded indentation.

Signed-off-by: Jeff Layton <jlayton@samba.org>

diff --git a/setcifsacl.c b/setcifsacl.c
index e97a35fc7c6e0a0dc47d7439e125c0cc15334211..380adac4eabfb8f93d0bb4880dbf1c935f126f09 100644 (file)
--- a/setcifsacl.c
+++ b/setcifsacl.c
@@ -329,19 +329,16 @@ get_numfaces(struct cifs_ntsd *pntsd, ssize_t acl_len,
        struct cifs_ctrl_acl *ldaclptr;
        char *end_of_acl = ((char *)pntsd) + acl_len;
 
-       if (pntsd == NULL)
-               return 0;
-
        dacloffset = le32toh(pntsd->dacloffset);
        if (!dacloffset)
                return 0;
-       else {
-               ldaclptr = (struct cifs_ctrl_acl *)((char *)pntsd + dacloffset);
-               /* validate that we do not go past end of acl */
-               if (end_of_acl >= (char *)ldaclptr + le16toh(ldaclptr->size)) {
-                       numfaces = le32toh(ldaclptr->num_aces);
-                       *daclptr = ldaclptr;
-               }
+
+       ldaclptr = (struct cifs_ctrl_acl *)((char *)pntsd + dacloffset);
+
+       /* validate that we do not go past end of acl */
+       if (end_of_acl >= (char *)ldaclptr + le16toh(ldaclptr->size)) {
+               numfaces = le32toh(ldaclptr->num_aces);
+               *daclptr = ldaclptr;
        }
 
        return numfaces;