MFp4: Reduce diff against vendor.
This commit is contained in:
parent
692fd5a7b9
commit
71ce4c9c10
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=169023
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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)
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user