diff options
| author |   sturm <sturm@openbsd.org> | 2006-04-30 14:20:07 +0000 |
|---|---|---|
| committer | sturm <sturm@openbsd.org> | 2006-04-30 14:20:07 +0000 |
| commit | b93f587a15bd356d38c53d3d018a0d2f18591b55 (patch) | |
| tree | b9534d2ab0aea74defff0f9d8012ea052f5c53f0 /sys/xfs | |
| parent | Add a missing , (diff) | |
| download | wireguard-openbsd-b93f587a15bd356d38c53d3d018a0d2f18591b55.tar.xz wireguard-openbsd-b93f587a15bd356d38c53d3d018a0d2f18591b55.zip | |
remove the simplelock argument from vfs_busy() which is currently not
used and will never be used this way in VFS
requested by and ok pedro, ok krw, biorn
Diffstat (limited to 'sys/xfs')
| -rw-r--r-- | sys/xfs/xfs_config.h | 5 | ||||
| -rw-r--r-- | sys/xfs/xfs_dev-common.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/xfs/xfs_config.h b/sys/xfs/xfs_config.h index 32e33f0ec59..28b1ffcc284 100644 --- a/sys/xfs/xfs_config.h +++ b/sys/xfs/xfs_config.h @@ -1260,7 +1260,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg } /* #undef HAVE_THREE_ARGUMENT_SELRECORD */ /* define if vfs_busy takes three arguments */ -#define HAVE_THREE_ARGUMENT_VFS_BUSY 1 +/* #undef HAVE_THREE_ARGUMENT_VFS_BUSY */ /* define if vfs_name_hash takes three arguments */ /* #undef HAVE_THREE_ARGUMENT_VFS_NAME_HASH */ @@ -1289,6 +1289,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg } /* define if vfs_getnewfsid takes two arguments */ /* #undef HAVE_TWO_ARGUMENT_VFS_GETNEWFSID */ +/* define if vfs_busy takes two arguments */ +#define HAVE_TWO_ARGUMENT_VFS_BUSY 1 + /* define if vget takes two arguments */ /* #undef HAVE_TWO_ARGUMENT_VGET */ diff --git a/sys/xfs/xfs_dev-common.c b/sys/xfs/xfs_dev-common.c index 774596dd1d5..533bcae5a02 100644 --- a/sys/xfs/xfs_dev-common.c +++ b/sys/xfs/xfs_dev-common.c @@ -113,7 +113,10 @@ xfs_devopen_common(dev_t dev) return 0; } -#if defined(HAVE_THREE_ARGUMENT_VFS_BUSY) +#if defined(HAVE_TWO_ARGUMENT_VFS_BUSY) +#define xfs_vfs_busy(mp, flags, lock, proc) vfs_busy((mp), (flags)) +#define xfs_vfs_unbusy(mp, proc) vfs_unbusy((mp)) +#elif defined(HAVE_THREE_ARGUMENT_VFS_BUSY) #define xfs_vfs_busy(mp, flags, lock, proc) vfs_busy((mp), (flags), (lock)) #define xfs_vfs_unbusy(mp, proc) vfs_unbusy((mp)) #elif defined(HAVE_FOUR_ARGUMENT_VFS_BUSY) |