upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some style bugs:

Browse source 
- 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.
This commit is contained in:
Bruce Evans 2004-02-14 04:41:13 +00:00
parent d3e1c2411e
commit e9827c6d93
2 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/fs/msdosfs/msdosfs_vfsops.c
View file

@ -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

28
sys/ufs/ffs/ffs_vfsops.c
View file

@ -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