X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6d2010ae8f7a6078e10b361c6962983bab233e0f..c18c124eaa464aaaa5549e99e5a70fc9cbb50944:/bsd/hfs/hfs_notification.c

diff --git a/bsd/hfs/hfs_notification.c b/bsd/hfs/hfs_notification.c
index 227e744b2..621c58de5 100644
--- a/bsd/hfs/hfs_notification.c
+++ b/bsd/hfs/hfs_notification.c
@@ -58,9 +58,14 @@ void hfs_generate_volume_notifications(struct hfsmount *hfsmp)
 {
 	fsid_t fsid;
 	u_int32_t freeblks, state=999;
-		
-	fsid.val[0] = (long)hfsmp->hfs_raw_dev;
-	fsid.val[1] = (long)vfs_typenum(HFSTOVFS(hfsmp));
+
+	/* Do not generate low disk notifications for read-only volumes */
+	if (hfsmp->hfs_flags & HFS_READ_ONLY) {
+		return;
+	}
+
+	fsid.val[0] = hfsmp->hfs_raw_dev;
+	fsid.val[1] = vfs_typenum(HFSTOVFS(hfsmp));
 	
 	freeblks = hfs_freeblks(hfsmp, 1);
 
@@ -72,33 +77,50 @@ void hfs_generate_volume_notifications(struct hfsmount *hfsmp)
 		state = 0;
 	}
 
+	/* Free blocks are less than dangerlimit for the first time */
 	if (state == 2 && !(hfsmp->hfs_notification_conditions & VQ_VERYLOWDISK)) {
 		/* Dump some logging to track down intermittent issues */
-		printf("HFS: Very Low Disk: freeblks: %d, dangerlimit: %d\n", freeblks, hfsmp->hfs_freespace_notify_dangerlimit);
+		printf("hfs: set VeryLowDisk: vol:%s, freeblks:%d, dangerlimit:%d\n", hfsmp->vcbVN, freeblks, hfsmp->hfs_freespace_notify_dangerlimit);
+
 #if HFS_SPARSE_DEV
-		if (hfsmp->hfs_flags & HFS_HAS_SPARSE_DEVICE) {
-			if (hfsmp->hfs_backingfs_rootvp) {
-				struct mount *mp = vnode_mount (hfsmp->hfs_backingfs_rootvp);
-				/* If we're a sparse device, dump some info about the backing store... */
-				if (mp) {
-					printf("HFS: Very Low Disk: backingstore b_avail %lld, tag %d\n", mp->mnt_vfsstat.f_bavail, hfsmp->hfs_backingfs_rootvp->v_tag);
-				}
-			}
+		// If we're a sparse device, dump some info about the backing store..
+		hfs_lock_mount(hfsmp);
+		vnode_t backing_vp = hfsmp->hfs_backingfs_rootvp;
+		if (backing_vp && vnode_get(backing_vp) != 0)
+			backing_vp = NULL;
+		hfs_unlock_mount(hfsmp);
+
+		if (backing_vp) {
+			struct mount *mp = vnode_mount(backing_vp);
+			printf("hfs: set VeryLowDisk: vol:%s, backingstore b_avail:%lld, tag:%d\n", 
+				   hfsmp->vcbVN, mp->mnt_vfsstat.f_bavail, backing_vp->v_tag);
+			vnode_put(backing_vp);
 		}
 #endif
+
 		hfsmp->hfs_notification_conditions |= (VQ_VERYLOWDISK|VQ_LOWDISK);
 		vfs_event_signal(&fsid, hfsmp->hfs_notification_conditions, (intptr_t)NULL);
 	} else if (state == 1) {
+		/* Free blocks are less than warning limit for the first time */
 		if (!(hfsmp->hfs_notification_conditions & VQ_LOWDISK)) {
-			printf("HFS: Low Disk: freeblks: %d, warninglimit: %d\n", freeblks, hfsmp->hfs_freespace_notify_warninglimit);
+			printf("hfs: set LowDisk: vol:%s, freeblks:%d, warninglimit:%d\n", hfsmp->vcbVN, freeblks, hfsmp->hfs_freespace_notify_warninglimit);
 			hfsmp->hfs_notification_conditions |= VQ_LOWDISK;
 			vfs_event_signal(&fsid, hfsmp->hfs_notification_conditions, (intptr_t)NULL);
 		} else if (hfsmp->hfs_notification_conditions & VQ_VERYLOWDISK) {
+			/* Free blocks count has increased from danger limit to warning limit, so just clear VERYLOWDISK warning */
+			printf("hfs: clear VeryLowDisk: vol:%s, freeblks:%d, dangerlimit:%d\n", hfsmp->vcbVN, freeblks, hfsmp->hfs_freespace_notify_dangerlimit);
 			hfsmp->hfs_notification_conditions &= ~VQ_VERYLOWDISK;
 			vfs_event_signal(&fsid, hfsmp->hfs_notification_conditions, (intptr_t)NULL);
 		}
 	} else if (state == 0) {
+		/* Free blocks count has increased to desirable level, so clear all conditions */
 		if (hfsmp->hfs_notification_conditions & (VQ_LOWDISK|VQ_VERYLOWDISK)) {
+			if (hfsmp->hfs_notification_conditions & VQ_LOWDISK) {
+				printf("hfs: clear LowDisk: vol:%s, freeblks:%d, warninglimit:%d, desiredlevel:%d\n", hfsmp->vcbVN, freeblks, hfsmp->hfs_freespace_notify_warninglimit, hfsmp->hfs_freespace_notify_desiredlevel);
+			}
+			if (hfsmp->hfs_notification_conditions & VQ_VERYLOWDISK) {
+				printf("hfs: clear VeryLowDisk: vol:%s, freeblks:%d, dangerlimit:%d\n", hfsmp->vcbVN, freeblks, hfsmp->hfs_freespace_notify_warninglimit);
+			} 
 			hfsmp->hfs_notification_conditions &= ~(VQ_VERYLOWDISK|VQ_LOWDISK);
 			if (hfsmp->hfs_notification_conditions == 0) {
 				vfs_event_signal(&fsid, VQ_UPDATE, (intptr_t)NULL);