From e9827c6d9354609d43508fe2cfb54f024f6527a8 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sat, 14 Feb 2004 04:41:13 +0000 Subject: [PATCH] Fixed some style bugs: - don't unlock the vnode after vinvalbuf() only to have to relock it almost immediately. - don't refer to devices classified by vn_isdisk() as block devices. --- sys/fs/msdosfs/msdosfs_vfsops.c | 8 ++++---- sys/ufs/ffs/ffs_vfsops.c | 28 ++++++++++------------------ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 12dd65c7200..edcdd2ed866 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -232,7 +232,7 @@ msdosfs_mount(mp, path, data, ndp, td) } /* * Not an update, or updating the name: look up the name - * and verify that it refers to a sensible block device. + * and verify that it refers to a sensible disk device. */ NDINIT(ndp, LOOKUP, FOLLOW, UIO_USERSPACE, args.fspec, td); error = namei(ndp); @@ -323,12 +323,12 @@ mountmsdosfs(devvp, mp, td, argp) return (EBUSY); vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); error = vinvalbuf(devvp, V_SAVE, td->td_ucred, td, 0, 0); - VOP_UNLOCK(devvp, 0, td); - if (error) + if (error) { + VOP_UNLOCK(devvp, 0, td); return (error); + } ronly = (mp->mnt_flag & MNT_RDONLY) != 0; - vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); /* * XXX: open the device with read and write access even if only * read access is needed now. Write access is needed if the diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 6486c315583..298f46297d6 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -313,7 +313,7 @@ ffs_mount(mp, path, data, ndp, td) /* * Not an update, or updating the name: look up the name - * and verify that it refers to a sensible block device. + * and verify that it refers to a sensible disk device. */ NDINIT(ndp, LOOKUP, FOLLOW, UIO_USERSPACE, args.fspec, td); if ((error = namei(ndp)) != 0) @@ -416,20 +416,15 @@ ffs_reload(mp, cred, td) */ devvp = VFSTOUFS(mp)->um_devvp; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = vinvalbuf(devvp, 0, cred, td, 0, 0); - VOP_UNLOCK(devvp, 0, td); - if (error) + if (vinvalbuf(devvp, 0, cred, td, 0, 0) != 0) panic("ffs_reload: dirty1"); - /* * Only VMIO the backing device if the backing device is a real - * block device. + * disk device. See ffs_mountfs() for more details. */ - if (vn_isdisk(devvp, NULL)) { - vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); + if (vn_isdisk(devvp, NULL)) vfs_object_create(devvp, td, td->td_ucred); - VOP_UNLOCK(devvp, 0, td); - } + VOP_UNLOCK(devvp, 0, td); /* * Step 2: re-read superblock from disk. @@ -588,24 +583,21 @@ ffs_mountfs(devvp, mp, td) return (EBUSY); vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); error = vinvalbuf(devvp, V_SAVE, cred, td, 0, 0); - VOP_UNLOCK(devvp, 0, td); - if (error) + if (error) { + VOP_UNLOCK(devvp, 0, td); return (error); + } /* * Only VMIO the backing device if the backing device is a real - * block device. + * disk device. * Note that it is optional that the backing device be VMIOed. This * increases the opportunity for metadata caching. */ - if (vn_isdisk(devvp, NULL)) { - vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); + if (vn_isdisk(devvp, NULL)) vfs_object_create(devvp, td, cred); - VOP_UNLOCK(devvp, 0, td); - } ronly = (mp->mnt_flag & MNT_RDONLY) != 0; - vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); /* * XXX: open the device with read and write access even if only * read access is needed now. Write access is needed if the