diff options
| author | dwmalone <dwmalone@FreeBSD.org> | 2000-12-08 21:51:06 +0000 |
|---|---|---|
| committer | dwmalone <dwmalone@FreeBSD.org> | 2000-12-08 21:51:06 +0000 |
| commit | dd75d1d73b4f3034c1d9f621a49fff58b1d71eb1 (patch) | |
| tree | 197ae73617ae75afe008897f6906b84835589ea2 /sys/fs/ntfs | |
| parent | ed5dbfbd3cd619638a7baac288f548aa1398edac (diff) | |
| download | FreeBSD-src-dd75d1d73b4f3034c1d9f621a49fff58b1d71eb1.zip FreeBSD-src-dd75d1d73b4f3034c1d9f621a49fff58b1d71eb1.tar.gz | |
Convert more malloc+bzero to malloc+M_ZERO.
Submitted by: josh@zipperup.org
Submitted by: Robert Drehmel <robd@gmx.net>
Diffstat (limited to 'sys/fs/ntfs')
| -rw-r--r-- | sys/fs/ntfs/ntfs_subr.c | 12 | ||||
| -rw-r--r-- | sys/fs/ntfs/ntfs_vfsops.c | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c index 839f752..d9b38d4 100644 --- a/sys/fs/ntfs/ntfs_subr.c +++ b/sys/fs/ntfs/ntfs_subr.c @@ -394,10 +394,9 @@ ntfs_ntlookup( } } while (LOCKMGR(&ntfs_hashlock, LK_EXCLUSIVE | LK_SLEEPFAIL, NULL)); - MALLOC(ip, struct ntnode *, sizeof(struct ntnode), - M_NTFSNTNODE, M_WAITOK); + MALLOC(ip, struct ntnode *, sizeof(struct ntnode), M_NTFSNTNODE, + M_WAITOK | M_ZERO); ddprintf(("ntfs_ntlookup: allocating ntnode: %d: %p\n", ino, ip)); - bzero((caddr_t) ip, sizeof(struct ntnode)); /* Generic initialization */ ip->i_devvp = ntmp->ntm_devvp; @@ -544,8 +543,7 @@ ntfs_attrtontvattr( *rvapp = NULL; MALLOC(vap, struct ntvattr *, sizeof(struct ntvattr), - M_NTFSNTVATTR, M_WAITOK); - bzero(vap, sizeof(struct ntvattr)); + M_NTFSNTVATTR, M_WAITOK | M_ZERO); vap->va_ip = NULL; vap->va_flag = rap->a_hdr.a_flag; vap->va_type = rap->a_hdr.a_type; @@ -737,8 +735,8 @@ ntfs_fget( if (*fpp) return (0); - MALLOC(fp, struct fnode *, sizeof(struct fnode), M_NTFSFNODE, M_WAITOK); - bzero(fp, sizeof(struct fnode)); + MALLOC(fp, struct fnode *, sizeof(struct fnode), M_NTFSFNODE, + M_WAITOK | M_ZERO); dprintf(("ntfs_fget: allocating fnode: %p\n",fp)); fp->f_ip = ip; diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c index e5a0216..7c6b2c0 100644 --- a/sys/fs/ntfs/ntfs_vfsops.c +++ b/sys/fs/ntfs/ntfs_vfsops.c @@ -478,8 +478,7 @@ ntfs_mountfs(devvp, mp, argsp, p) error = bread(devvp, BBLOCK, BBSIZE, NOCRED, &bp); if (error) goto out; - ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK ); - bzero( ntmp, sizeof *ntmp ); + ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO); bcopy( bp->b_data, &ntmp->ntm_bootfile, sizeof(struct bootfile) ); brelse( bp ); bp = NULL; |
