Attachment #238557 for bug #19683

View | Details | Raw Unified | Return to bug 19683
Collapse All | Expand All




				     (FS_SUJ | FS_NEEDSFSCK)) == 0 &&
				     (fs->fs_flags & FS_DOSOFTDEP))) {
					printf("WARNING: %s was not properly "
					   "dismounted\n",
					   mp->mnt_stat.f_mntonname);
				} else {
					vfs_mount_error(mp,
					   "R/W mount of %s denied. %s.%s",
					   mp->mnt_stat.f_mntonname,
					   "Filesystem is not clean - run fsck",
					   (fs->fs_flags & FS_SUJ) == 0 ? "" :
					   " Forced mount will invalidate"

	UFS_LOCK(ump);
	if (fs->fs_pendingblocks != 0 || fs->fs_pendinginodes != 0) {
		printf("WARNING: %s: reload pending error: blocks %jd "
		    "files %d\n", mp->mnt_stat.f_mntonname,
		    (intmax_t)fs->fs_pendingblocks, fs->fs_pendinginodes);
		fs->fs_pendingblocks = 0;
		fs->fs_pendinginodes = 0;
	}

		    ((fs->fs_flags & (FS_SUJ | FS_NEEDSFSCK)) == 0 &&
		     (fs->fs_flags & FS_DOSOFTDEP))) {
			printf("WARNING: %s was not properly dismounted\n",
			    mp->mnt_stat.f_mntonname);
		} else {
			vfs_mount_error(mp, "R/W mount on %s denied. "
			    "Filesystem is not clean - run fsck.%s",
			    mp->mnt_stat.f_mntonname,
			    (fs->fs_flags & FS_SUJ) == 0 ? "" :
			    " Forced mount will invalidate journal contents");
			error = EPERM;

		if ((fs->fs_pendingblocks != 0 || fs->fs_pendinginodes != 0) &&
		    (mp->mnt_flag & MNT_FORCE)) {
			printf("WARNING: %s: lost blocks %jd files %d\n",
			    mp->mnt_stat.f_mntonname,
			    (intmax_t)fs->fs_pendingblocks,
			    fs->fs_pendinginodes);
			fs->fs_pendingblocks = 0;
			fs->fs_pendinginodes = 0;

	}
	if (fs->fs_pendingblocks != 0 || fs->fs_pendinginodes != 0) {
		printf("WARNING: %s: mount pending error: blocks %jd "
		    "files %d\n", mp->mnt_stat.f_mntonname,
		    (intmax_t)fs->fs_pendingblocks, fs->fs_pendinginodes);
		fs->fs_pendingblocks = 0;
		fs->fs_pendinginodes = 0;
	}

Return to bug 19683

Lines 604-614 ffs_mount(struct mount *mp) Link Here

(-)b/sys/ufs/ffs/ffs_vfsops.c (-10 / +13 lines)
604	(FS_SUJ \| FS_NEEDSFSCK)) == 0 &&	604	(FS_SUJ \| FS_NEEDSFSCK)) == 0 &&
605	(fs->fs_flags & FS_DOSOFTDEP))) {	605	(fs->fs_flags & FS_DOSOFTDEP))) {
606	printf("WARNING: %s was not properly "	606	printf("WARNING: %s was not properly "
607	"dismounted\n", fs->fs_fsmnt);	607	"dismounted\n",
		608	mp->mnt_stat.f_mntonname);
608	} else {	609	} else {
609	vfs_mount_error(mp,	610	vfs_mount_error(mp,
610	"R/W mount of %s denied. %s.%s",	611	"R/W mount of %s denied. %s.%s",
611	fs->fs_fsmnt,	612	mp->mnt_stat.f_mntonname,
612	"Filesystem is not clean - run fsck",	613	"Filesystem is not clean - run fsck",
613	(fs->fs_flags & FS_SUJ) == 0 ? "" :	614	(fs->fs_flags & FS_SUJ) == 0 ? "" :
614	" Forced mount will invalidate"	615	" Forced mount will invalidate"
Lines 810-817 ffs_reload(struct mount *mp, int flags) Link Here
810	UFS_LOCK(ump);	811	UFS_LOCK(ump);
811	if (fs->fs_pendingblocks != 0 \|\| fs->fs_pendinginodes != 0) {	812	if (fs->fs_pendingblocks != 0 \|\| fs->fs_pendinginodes != 0) {
812	printf("WARNING: %s: reload pending error: blocks %jd "	813	printf("WARNING: %s: reload pending error: blocks %jd "
813	"files %d\n", fs->fs_fsmnt, (intmax_t)fs->fs_pendingblocks,	814	"files %d\n", mp->mnt_stat.f_mntonname,
814	fs->fs_pendinginodes);	815	(intmax_t)fs->fs_pendingblocks, fs->fs_pendinginodes);
815	fs->fs_pendingblocks = 0;	816	fs->fs_pendingblocks = 0;
816	fs->fs_pendinginodes = 0;	817	fs->fs_pendinginodes = 0;
817	}	818	}
Lines 974-983 ffs_mountfs(struct vnode odevvp, struct mount mp, struct thread *td) Link Here
974	((fs->fs_flags & (FS_SUJ \| FS_NEEDSFSCK)) == 0 &&	975	((fs->fs_flags & (FS_SUJ \| FS_NEEDSFSCK)) == 0 &&
975	(fs->fs_flags & FS_DOSOFTDEP))) {	976	(fs->fs_flags & FS_DOSOFTDEP))) {
976	printf("WARNING: %s was not properly dismounted\n",	977	printf("WARNING: %s was not properly dismounted\n",
977	fs->fs_fsmnt);	978	mp->mnt_stat.f_mntonname);
978	} else {	979	} else {
979	vfs_mount_error(mp, "R/W mount of %s denied. %s%s",	980	vfs_mount_error(mp, "R/W mount on %s denied. "
980	fs->fs_fsmnt, "Filesystem is not clean - run fsck.",	981	"Filesystem is not clean - run fsck.%s",
		982	mp->mnt_stat.f_mntonname,
981	(fs->fs_flags & FS_SUJ) == 0 ? "" :	983	(fs->fs_flags & FS_SUJ) == 0 ? "" :
982	" Forced mount will invalidate journal contents");	984	" Forced mount will invalidate journal contents");
983	error = EPERM;	985	error = EPERM;
Lines 986-992 ffs_mountfs(struct vnode odevvp, struct mount mp, struct thread *td) Link Here
986	if ((fs->fs_pendingblocks != 0 \|\| fs->fs_pendinginodes != 0) &&	988	if ((fs->fs_pendingblocks != 0 \|\| fs->fs_pendinginodes != 0) &&
987	(mp->mnt_flag & MNT_FORCE)) {	989	(mp->mnt_flag & MNT_FORCE)) {
988	printf("WARNING: %s: lost blocks %jd files %d\n",	990	printf("WARNING: %s: lost blocks %jd files %d\n",
989	fs->fs_fsmnt, (intmax_t)fs->fs_pendingblocks,	991	mp->mnt_stat.f_mntonname,
		992	(intmax_t)fs->fs_pendingblocks,
990	fs->fs_pendinginodes);	993	fs->fs_pendinginodes);
991	fs->fs_pendingblocks = 0;	994	fs->fs_pendingblocks = 0;
992	fs->fs_pendinginodes = 0;	995	fs->fs_pendinginodes = 0;
Lines 994-1001 ffs_mountfs(struct vnode odevvp, struct mount mp, struct thread *td) Link Here
994	}	997	}
995	if (fs->fs_pendingblocks != 0 \|\| fs->fs_pendinginodes != 0) {	998	if (fs->fs_pendingblocks != 0 \|\| fs->fs_pendinginodes != 0) {
996	printf("WARNING: %s: mount pending error: blocks %jd "	999	printf("WARNING: %s: mount pending error: blocks %jd "
997	"files %d\n", fs->fs_fsmnt, (intmax_t)fs->fs_pendingblocks,	1000	"files %d\n", mp->mnt_stat.f_mntonname,
998	fs->fs_pendinginodes);	1001	(intmax_t)fs->fs_pendingblocks, fs->fs_pendinginodes);
999	fs->fs_pendingblocks = 0;	1002	fs->fs_pendingblocks = 0;
1000	fs->fs_pendinginodes = 0;	1003	fs->fs_pendinginodes = 0;
1001	}	1004	}