MFp4: Reduce diff against vendor.

This commit is contained in:
Pawel Jakub Dawidek 2007-04-24 16:49:01 +00:00
parent 692fd5a7b9
commit 71ce4c9c10
6 changed files with 8 additions and 4 deletions

View File

@ -41,6 +41,7 @@
#include <sys/unistd.h>
#include <sys/sdt.h>
#include <sys/fs/zfs.h>
#include <sys/policy.h>
#include <sys/zfs_znode.h>
#include <sys/zfs_acl.h>
#include <sys/zfs_dir.h>

View File

@ -41,6 +41,7 @@
#include <sys/stat.h>
#include <sys/unistd.h>
#include <sys/random.h>
#include <sys/policy.h>
#include <sys/kcondvar.h>
#include <sys/callb.h>
#include <sys/smp.h>

View File

@ -2963,7 +2963,7 @@ zfs_fid(vnode_t *vp, fid_t *fidp)
if (size == LONG_FID_LEN) {
uint64_t objsetid = dmu_objset_id(zfsvfs->z_os);
zfid_long_t *zlfid;
zfid_long_t *zlfid;
zlfid = (zfid_long_t *)fidp;
@ -3413,7 +3413,7 @@ zfs_freebsd_reclaim(ap)
struct thread *a_td;
} */ *ap;
{
vnode_t *vp = ap->a_vp;
vnode_t *vp = ap->a_vp;
znode_t *zp = VTOZ(vp);
if (zp != NULL)

View File

@ -41,6 +41,7 @@
#include <sys/unistd.h>
#include <sys/sdt.h>
#include <sys/fs/zfs.h>
#include <sys/policy.h>
#include <sys/zfs_znode.h>
#include <sys/zfs_acl.h>
#include <sys/zfs_dir.h>

View File

@ -41,6 +41,7 @@
#include <sys/stat.h>
#include <sys/unistd.h>
#include <sys/random.h>
#include <sys/policy.h>
#include <sys/kcondvar.h>
#include <sys/callb.h>
#include <sys/smp.h>

View File

@ -2963,7 +2963,7 @@ zfs_fid(vnode_t *vp, fid_t *fidp)
if (size == LONG_FID_LEN) {
uint64_t objsetid = dmu_objset_id(zfsvfs->z_os);
zfid_long_t *zlfid;
zfid_long_t *zlfid;
zlfid = (zfid_long_t *)fidp;
@ -3413,7 +3413,7 @@ zfs_freebsd_reclaim(ap)
struct thread *a_td;
} */ *ap;
{
vnode_t *vp = ap->a_vp;
vnode_t *vp = ap->a_vp;
znode_t *zp = VTOZ(vp);
if (zp != NULL)