summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authordavide <davide@FreeBSD.org>2012-11-14 19:10:50 +0000
committerdavide <davide@FreeBSD.org>2012-11-14 19:10:50 +0000
commitb4e3eb067788c102b35cd279a0829fb93c93aa3c (patch)
tree0bcb619807c478a51039aea81f3fc598da32616d /sys/fs
parent9c86bf71ddd7aca386785ad65ded311e6e8f4f54 (diff)
downloadFreeBSD-src-b4e3eb067788c102b35cd279a0829fb93c93aa3c.zip
FreeBSD-src-b4e3eb067788c102b35cd279a0829fb93c93aa3c.tar.gz
Get rid of some old debug code. It provides checks similar to the one
offered by RedZone so there's no need to keep it. Sponsored by: iXsystems inc.
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/smbfs/smbfs_node.c28
-rw-r--r--sys/fs/smbfs/smbfs_vnops.c12
2 files changed, 0 insertions, 40 deletions
diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c
index 8be6edd..66696ca 100644
--- a/sys/fs/smbfs/smbfs_node.c
+++ b/sys/fs/smbfs/smbfs_node.c
@@ -70,18 +70,8 @@ smbfs_name_alloc(const u_char *name, int nmlen)
u_char *cp;
nmlen++;
-#ifdef SMBFS_NAME_DEBUG
- cp = malloc(nmlen + 2 + sizeof(int), M_SMBNODENAME, M_WAITOK);
- *(int*)cp = nmlen;
- cp += sizeof(int);
- cp[0] = 0xfc;
- cp++;
- bcopy(name, cp, nmlen - 1);
- cp[nmlen] = 0xfe;
-#else
cp = malloc(nmlen, M_SMBNODENAME, M_WAITOK);
bcopy(name, cp, nmlen - 1);
-#endif
cp[nmlen - 1] = 0;
return cp;
}
@@ -89,26 +79,8 @@ smbfs_name_alloc(const u_char *name, int nmlen)
static void
smbfs_name_free(u_char *name)
{
-#ifdef SMBFS_NAME_DEBUG
- int nmlen, slen;
- u_char *cp;
- cp = name;
- cp--;
- if (*cp != 0xfc)
- panic("First byte of name entry '%s' corrupted", name);
- cp -= sizeof(int);
- nmlen = *(int*)cp;
- slen = strlen(name) + 1;
- if (nmlen != slen)
- panic("Name length mismatch: was %d, now %d name '%s'",
- nmlen, slen, name);
- if (name[nmlen] != 0xfe)
- panic("Last byte of name entry '%s' corrupted\n", name);
- free(cp, M_SMBNODENAME);
-#else
free(name, M_SMBNODENAME);
-#endif
}
static int __inline
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c
index 82dbee7..9b00910 100644
--- a/sys/fs/smbfs/smbfs_vnops.c
+++ b/sys/fs/smbfs/smbfs_vnops.c
@@ -1135,18 +1135,6 @@ smbfs_lookup(ap)
SMBFSERR("invalid '..'\n");
return EIO;
}
-#ifdef SMB_VNODE_DEBUG
- {
- char *cp, c;
-
- cp = name + nmlen;
- c = *cp;
- *cp = 0;
- SMBVDEBUG("%d '%s' in '%s' id=d\n", nameiop, name,
- VTOSMB(dvp)->n_name);
- *cp = c;
- }
-#endif
islastcn = flags & ISLASTCN;
if (islastcn && (mp->mnt_flag & MNT_RDONLY) && (nameiop != LOOKUP))
return EROFS;
OpenPOWER on IntegriCloud