summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2008-10-10 21:23:50 +0000
committerattilio <attilio@FreeBSD.org>2008-10-10 21:23:50 +0000
commitb8bf37e5857b138031059dd4768deb4937efe183 (patch)
treefd8b76b514f556d4aec4cdd5d6fd55919f6e33ab /sys/fs
parent7ce828dea0b330b67ef23488dde94b994adcdcfc (diff)
downloadFreeBSD-src-b8bf37e5857b138031059dd4768deb4937efe183.zip
FreeBSD-src-b8bf37e5857b138031059dd4768deb4937efe183.tar.gz
Remove the struct thread unuseful argument from bufobj interface.
In particular following functions KPI results modified: - bufobj_invalbuf() - bufsync() and BO_SYNC() "virtual method" of the buffer objects set. Main consumers of bufobj functions are affected by this change too and, in particular, functions which changed their KPI are: - vinvalbuf() - g_vfs_close() Due to the KPI breakage, __FreeBSD_version will be bumped in a later commit. As a side note, please consider just temporary the 'curthread' argument passing to VOP_SYNC() (in bufsync()) as it will be axed out ASAP Reviewed by: kib Tested by: Giovanni Trematerra <giovanni dot trematerra at gmail dot com>
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c14
-rw-r--r--sys/fs/hpfs/hpfs_vfsops.c6
-rw-r--r--sys/fs/msdosfs/msdosfs_vfsops.c11
-rw-r--r--sys/fs/ntfs/ntfs_vfsops.c6
-rw-r--r--sys/fs/nwfs/nwfs_io.c4
-rw-r--r--sys/fs/smbfs/smbfs_io.c4
-rw-r--r--sys/fs/udf/udf_vfsops.c12
7 files changed, 27 insertions, 30 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 41502d1..f4ff62d 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -88,8 +88,7 @@ static struct vfsops cd9660_vfsops = {
VFS_SET(cd9660_vfsops, cd9660, VFCF_READONLY);
MODULE_VERSION(cd9660, 1);
-static int iso_mountfs(struct vnode *devvp, struct mount *mp,
- struct thread *td);
+static int iso_mountfs(struct vnode *devvp, struct mount *mp);
/*
* VFS Operations.
@@ -181,7 +180,7 @@ cd9660_mount(struct mount *mp, struct thread *td)
VOP_UNLOCK(devvp, 0);
if ((mp->mnt_flag & MNT_UPDATE) == 0) {
- error = iso_mountfs(devvp, mp, td);
+ error = iso_mountfs(devvp, mp);
} else {
if (devvp != imp->im_devvp)
error = EINVAL; /* needs translation */
@@ -200,10 +199,9 @@ cd9660_mount(struct mount *mp, struct thread *td)
* Common code for mount and mountroot
*/
static int
-iso_mountfs(devvp, mp, td)
+iso_mountfs(devvp, mp)
struct vnode *devvp;
struct mount *mp;
- struct thread *td;
{
struct iso_mnt *isomp = (struct iso_mnt *)0;
struct buf *bp = NULL;
@@ -249,7 +247,7 @@ iso_mountfs(devvp, mp, td)
if ((ISO_DEFAULT_BLOCK_SIZE % cp->provider->sectorsize) != 0) {
DROP_GIANT();
g_topology_lock();
- g_vfs_close(cp, td);
+ g_vfs_close(cp);
g_topology_unlock();
PICKUP_GIANT();
return (EINVAL);
@@ -482,7 +480,7 @@ out:
if (cp != NULL) {
DROP_GIANT();
g_topology_lock();
- g_vfs_close(cp, td);
+ g_vfs_close(cp);
g_topology_unlock();
PICKUP_GIANT();
}
@@ -525,7 +523,7 @@ cd9660_unmount(mp, mntflags, td)
}
DROP_GIANT();
g_topology_lock();
- g_vfs_close(isomp->im_cp, td);
+ g_vfs_close(isomp->im_cp);
g_topology_unlock();
PICKUP_GIANT();
vrele(isomp->im_devvp);
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index 7fbe56f..02b5ea4 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -325,7 +325,7 @@ failed:
mp->mnt_data = NULL;
DROP_GIANT();
g_topology_lock();
- g_vfs_close(cp, td);
+ g_vfs_close(cp);
g_topology_unlock();
PICKUP_GIANT();
return (error);
@@ -356,10 +356,10 @@ hpfs_unmount(
return (error);
}
- vinvalbuf(hpmp->hpm_devvp, V_SAVE, td, 0, 0);
+ vinvalbuf(hpmp->hpm_devvp, V_SAVE, 0, 0);
DROP_GIANT();
g_topology_lock();
- g_vfs_close(hpmp->hpm_cp, td);
+ g_vfs_close(hpmp->hpm_cp);
g_topology_unlock();
PICKUP_GIANT();
vrele(hpmp->hpm_devvp);
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index e2525b2..8991e18 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -103,8 +103,7 @@ static MALLOC_DEFINE(M_MSDOSFSFAT, "msdosfs_fat", "MSDOSFS file allocation table
struct iconv_functions *msdosfs_iconv;
static int update_mp(struct mount *mp, struct thread *td);
-static int mountmsdosfs(struct vnode *devvp, struct mount *mp,
- struct thread *td);
+static int mountmsdosfs(struct vnode *devvp, struct mount *mp);
static vfs_fhtovp_t msdosfs_fhtovp;
static vfs_mount_t msdosfs_mount;
static vfs_root_t msdosfs_root;
@@ -375,7 +374,7 @@ msdosfs_mount(struct mount *mp, struct thread *td)
return (error);
}
if ((mp->mnt_flag & MNT_UPDATE) == 0) {
- error = mountmsdosfs(devvp, mp, td);
+ error = mountmsdosfs(devvp, mp);
#ifdef MSDOSFS_DEBUG /* only needed for the printf below */
pmp = VFSTOMSDOSFS(mp);
#endif
@@ -405,7 +404,7 @@ msdosfs_mount(struct mount *mp, struct thread *td)
}
static int
-mountmsdosfs(struct vnode *devvp, struct mount *mp, struct thread *td)
+mountmsdosfs(struct vnode *devvp, struct mount *mp)
{
struct msdosfsmount *pmp;
struct buf *bp;
@@ -754,7 +753,7 @@ error_exit:
if (cp != NULL) {
DROP_GIANT();
g_topology_lock();
- g_vfs_close(cp, td);
+ g_vfs_close(cp);
g_topology_unlock();
PICKUP_GIANT();
}
@@ -824,7 +823,7 @@ msdosfs_unmount(struct mount *mp, int mntflags, struct thread *td)
#endif
DROP_GIANT();
g_topology_lock();
- g_vfs_close(pmp->pm_cp, td);
+ g_vfs_close(pmp->pm_cp);
g_topology_unlock();
PICKUP_GIANT();
vrele(pmp->pm_devvp);
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index e79072d..86ff17a 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -462,7 +462,7 @@ out:
DROP_GIANT();
g_topology_lock();
- g_vfs_close(cp, td);
+ g_vfs_close(cp);
g_topology_unlock();
PICKUP_GIANT();
@@ -506,11 +506,11 @@ ntfs_unmount(
if (error)
printf("ntfs_unmount: vflush failed(sysnodes): %d\n",error);
- vinvalbuf(ntmp->ntm_devvp, V_SAVE, td, 0, 0);
+ vinvalbuf(ntmp->ntm_devvp, V_SAVE, 0, 0);
DROP_GIANT();
g_topology_lock();
- g_vfs_close(ntmp->ntm_cp, td);
+ g_vfs_close(ntmp->ntm_cp);
g_topology_unlock();
PICKUP_GIANT();
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index 3ded52d..e45c2ad 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -618,7 +618,7 @@ nwfs_vinvalbuf(vp, td)
VM_OBJECT_UNLOCK(vp->v_bufobj.bo_object);
}
- error = vinvalbuf(vp, V_SAVE, td, PCATCH, 0);
+ error = vinvalbuf(vp, V_SAVE, PCATCH, 0);
while (error) {
if (error == ERESTART || error == EINTR) {
np->n_flag &= ~NFLUSHINPROG;
@@ -628,7 +628,7 @@ nwfs_vinvalbuf(vp, td)
}
return EINTR;
}
- error = vinvalbuf(vp, V_SAVE, td, PCATCH, 0);
+ error = vinvalbuf(vp, V_SAVE, PCATCH, 0);
}
np->n_flag &= ~(NMODIFIED | NFLUSHINPROG);
if (np->n_flag & NFLUSHWANT) {
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c
index 5fbbc61..2944a6b 100644
--- a/sys/fs/smbfs/smbfs_io.c
+++ b/sys/fs/smbfs/smbfs_io.c
@@ -690,7 +690,7 @@ smbfs_vinvalbuf(struct vnode *vp, struct thread *td)
VM_OBJECT_UNLOCK(vp->v_bufobj.bo_object);
}
- error = vinvalbuf(vp, V_SAVE, td, PCATCH, 0);
+ error = vinvalbuf(vp, V_SAVE, PCATCH, 0);
while (error) {
if (error == ERESTART || error == EINTR) {
np->n_flag &= ~NFLUSHINPROG;
@@ -700,7 +700,7 @@ smbfs_vinvalbuf(struct vnode *vp, struct thread *td)
}
return EINTR;
}
- error = vinvalbuf(vp, V_SAVE, td, PCATCH, 0);
+ error = vinvalbuf(vp, V_SAVE, PCATCH, 0);
}
np->n_flag &= ~(NMODIFIED | NFLUSHINPROG);
if (np->n_flag & NFLUSHWANT) {
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index 7485991..6c0d7d0 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -134,7 +134,7 @@ VFS_SET(udf_vfsops, udf, VFCF_READONLY);
MODULE_VERSION(udf, 1);
-static int udf_mountfs(struct vnode *, struct mount *, struct thread *);
+static int udf_mountfs(struct vnode *, struct mount *);
static int
udf_init(struct vfsconf *foo)
@@ -243,7 +243,7 @@ udf_mount(struct mount *mp, struct thread *td)
return (error);
}
- if ((error = udf_mountfs(devvp, mp, td))) {
+ if ((error = udf_mountfs(devvp, mp))) {
vrele(devvp);
return (error);
}
@@ -301,7 +301,7 @@ udf_checktag(struct desc_tag *tag, uint16_t id)
}
static int
-udf_mountfs(struct vnode *devvp, struct mount *mp, struct thread *td) {
+udf_mountfs(struct vnode *devvp, struct mount *mp) {
struct buf *bp = NULL;
struct anchor_vdp avdp;
struct udf_mnt *udfmp = NULL;
@@ -365,7 +365,7 @@ udf_mountfs(struct vnode *devvp, struct mount *mp, struct thread *td) {
(logical_secsize < cp->provider->sectorsize)) {
DROP_GIANT();
g_topology_lock();
- g_vfs_close(cp, td);
+ g_vfs_close(cp);
g_topology_unlock();
PICKUP_GIANT();
return (EINVAL);
@@ -493,7 +493,7 @@ bail:
brelse(bp);
DROP_GIANT();
g_topology_lock();
- g_vfs_close(cp, td);
+ g_vfs_close(cp);
g_topology_unlock();
PICKUP_GIANT();
return error;
@@ -524,7 +524,7 @@ udf_unmount(struct mount *mp, int mntflags, struct thread *td)
DROP_GIANT();
g_topology_lock();
- g_vfs_close(udfmp->im_cp, td);
+ g_vfs_close(udfmp->im_cp);
g_topology_unlock();
PICKUP_GIANT();
vrele(udfmp->im_devvp);
OpenPOWER on IntegriCloud