Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 20 Jul 2020 14:28:26 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r363367 - head/sys/fs/ext2fs
Message-ID:  <202007201428.06KESQ6B016198@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: markj
Date: Mon Jul 20 14:28:26 2020
New Revision: 363367
URL: https://svnweb.freebsd.org/changeset/base/363367

Log:
  ext2fs: Stop checking for failures from malloc(M_WAITOK).
  
  PR:		240545
  Submitted by:	Andrew Reiter <arr@watson.org>
  Reviewed by:	fsu
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D25707

Modified:
  head/sys/fs/ext2fs/ext2_acl.c
  head/sys/fs/ext2fs/ext2_alloc.c
  head/sys/fs/ext2fs/ext2_extents.c
  head/sys/fs/ext2fs/ext2_lookup.c
  head/sys/fs/ext2fs/ext2_vnops.c

Modified: head/sys/fs/ext2fs/ext2_acl.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_acl.c	Mon Jul 20 13:50:10 2020	(r363366)
+++ head/sys/fs/ext2fs/ext2_acl.c	Mon Jul 20 14:28:26 2020	(r363367)
@@ -234,8 +234,6 @@ ext2_getacl_posix1e(struct vop_getacl_args *ap)
 
 	len = sizeof(*ap->a_aclp) + sizeof(struct ext2_acl_header);
 	value = malloc(len, M_ACL, M_WAITOK);
-	if (!value)
-		return (ENOMEM);
 
 	error = vn_extattr_get(ap->a_vp, IO_NODELOCKED, attrnamespace, attrname,
 	    &len, value, ap->a_td);

Modified: head/sys/fs/ext2fs/ext2_alloc.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_alloc.c	Mon Jul 20 13:50:10 2020	(r363366)
+++ head/sys/fs/ext2fs/ext2_alloc.c	Mon Jul 20 14:28:26 2020	(r363367)
@@ -425,9 +425,6 @@ ext2_valloc(struct vnode *pvp, int mode, struct ucred 
 	}
 
 	ip = malloc(sizeof(struct inode), M_EXT2NODE, M_WAITOK | M_ZERO);
-	if (ip == NULL) {
-		return (ENOMEM);
-	}
 
 	/* Allocate a new vnode/inode. */
 	if ((error = getnewvnode("ext2fs", ump->um_mountp, &ext2_vnodeops, &vp)) != 0) {

Modified: head/sys/fs/ext2fs/ext2_extents.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_extents.c	Mon Jul 20 13:50:10 2020	(r363366)
+++ head/sys/fs/ext2fs/ext2_extents.c	Mon Jul 20 14:28:26 2020	(r363367)
@@ -322,9 +322,6 @@ ext4_ext_fill_path_bdata(struct ext4_extent_path *path
 	    ("ext4_ext_fill_path_bdata: bad ep_data"));
 
 	path->ep_data = malloc(bp->b_bufsize, M_EXT2EXTENTS, M_WAITOK);
-	if (!path->ep_data)
-		return (ENOMEM);
-
 	memcpy(path->ep_data, bp->b_data, bp->b_bufsize);
 	path->ep_blk = blk;
 
@@ -397,9 +394,6 @@ ext4_ext_find_extent(struct inode *ip, daddr_t block,
 		path = malloc(EXT4_EXT_DEPTH_MAX *
 		    sizeof(struct ext4_extent_path),
 		    M_EXT2EXTENTS, M_WAITOK | M_ZERO);
-		if (!path)
-			return (ENOMEM);
-
 		*ppath = path;
 		alloc = 1;
 	}
@@ -762,8 +756,6 @@ ext4_ext_split(struct inode *ip, struct ext4_extent_pa
 	/* Allocate new blocks. */
 	ablks = malloc(sizeof(e4fs_daddr_t) * depth,
 	    M_EXT2EXTENTS, M_WAITOK | M_ZERO);
-	if (!ablks)
-		return (ENOMEM);
 	for (a = 0; a < depth - at; a++) {
 		newblk = ext4_ext_alloc_meta(ip);
 		if (newblk == 0)
@@ -1517,9 +1509,6 @@ ext4_ext_remove_space(struct inode *ip, off_t length, 
 
 	path = malloc(sizeof(struct ext4_extent_path) * (depth + 1),
 	    M_EXT2EXTENTS, M_WAITOK | M_ZERO);
-	if (!path)
-		return (ENOMEM);
-
 	path[0].ep_header = ehp;
 	path[0].ep_depth = depth;
 	i = 0;

Modified: head/sys/fs/ext2fs/ext2_lookup.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_lookup.c	Mon Jul 20 13:50:10 2020	(r363366)
+++ head/sys/fs/ext2fs/ext2_lookup.c	Mon Jul 20 14:28:26 2020	(r363367)
@@ -894,10 +894,6 @@ ext2_add_first_entry(struct vnode *dvp, struct ext2fs_
 		entry->e2d_reclen = htole16(dirblksize -
 		    sizeof(struct ext2fs_direct_tail));
 		buf = malloc(dirblksize, M_TEMP, M_WAITOK);
-		if (!buf) {
-			error = ENOMEM;
-			goto out;
-		}
 		memcpy(buf, entry, EXT2_DIR_REC_LEN(entry->e2d_namlen));
 		ext2_init_dirent_tail(EXT2_DIRENT_TAIL(buf, dirblksize));
 		ext2_dirent_csum_set(dp, (struct ext2fs_direct_2 *)buf);

Modified: head/sys/fs/ext2fs/ext2_vnops.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_vnops.c	Mon Jul 20 13:50:10 2020	(r363366)
+++ head/sys/fs/ext2fs/ext2_vnops.c	Mon Jul 20 14:28:26 2020	(r363367)
@@ -1077,10 +1077,6 @@ abortit:
 			ext2_dec_nlink(dp);
 			dp->i_flag |= IN_CHANGE;
 			dirbuf = malloc(dp->i_e2fs->e2fs_bsize, M_TEMP, M_WAITOK | M_ZERO);
-			if (!dirbuf) {
-				error = ENOMEM;
-				goto bad;
-			}
 			error = vn_rdwr(UIO_READ, fvp, (caddr_t)dirbuf,
 			    ip->i_e2fs->e2fs_bsize, (off_t)0,
 			    UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHECK,
@@ -1390,12 +1386,6 @@ ext2_mkdir(struct vop_mkdir_args *ap)
 #define DIRBLKSIZ  VTOI(dvp)->i_e2fs->e2fs_bsize
 	dirtemplate.dotdot_reclen = htole16(DIRBLKSIZ - 12);
 	buf = malloc(DIRBLKSIZ, M_TEMP, M_WAITOK | M_ZERO);
-	if (!buf) {
-		error = ENOMEM;
-		ext2_dec_nlink(dp);
-		dp->i_flag |= IN_CHANGE;
-		goto bad;
-	}
 	if (EXT2_HAS_RO_COMPAT_FEATURE(fs, EXT2F_ROCOMPAT_METADATA_CKSUM)) {
 		dirtemplate.dotdot_reclen =
 		    htole16(le16toh(dirtemplate.dotdot_reclen) -

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007201428.06KESQ6B016198>