Remove fragments of support for the FreeBSD 3.x and 4.x branches.

This commit is contained in:
Tim J. Robbins 2003-03-06 10:38:18 +00:00
parent a9f65dc3a8
commit fe72c63e22
5 changed files with 0 additions and 25 deletions

View File

@ -47,9 +47,6 @@
struct smbfs_fctx;
struct smbnode {
#ifndef FB_CURRENT
struct lock n_lock; /* smbnode lock. (mbf) */
#endif
int n_flag;
struct vnode * n_parent;
struct vnode * n_vnode;

View File

@ -124,9 +124,6 @@ smbfs_mount(struct mount *mp, char *path, caddr_t data,
struct smb_share *ssp = NULL;
struct vnode *vp;
struct smb_cred scred;
#ifndef FB_CURRENT
size_t size;
#endif
int error;
char *pc, *pe;
@ -182,12 +179,6 @@ smbfs_mount(struct mount *mp, char *path, caddr_t data,
(S_IRWXU|S_IRWXG|S_IRWXO)) | S_IFDIR;
/* simple_lock_init(&smp->sm_npslock);*/
#ifndef FB_CURRENT
error = copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
if (error)
goto bad;
bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
#endif
pc = mp->mnt_stat.f_mntfromname;
pe = pc + sizeof(mp->mnt_stat.f_mntfromname);
bzero(pc, MNAMELEN);
@ -438,11 +429,7 @@ smbfs_sync(mp, waitfor, cred, td)
if (vp->v_mount != mp)
goto loop;
VI_LOCK(vp);
#ifndef FB_RELENG3
if (VOP_ISLOCKED(vp, NULL) || TAILQ_EMPTY(&vp->v_dirtyblkhd) ||
#else
if (VOP_ISLOCKED(vp) || TAILQ_EMPTY(&vp->v_dirtyblkhd) ||
#endif
waitfor == MNT_LAZY) {
VI_UNLOCK(vp);
continue;

View File

@ -83,9 +83,7 @@ static int smbfs_strategy(struct vop_strategy_args *);
static int smbfs_print(struct vop_print_args *);
static int smbfs_pathconf(struct vop_pathconf_args *ap);
static int smbfs_advlock(struct vop_advlock_args *);
#ifndef FB_RELENG3
static int smbfs_getextattr(struct vop_getextattr_args *ap);
#endif
vop_t **smbfs_vnodeop_p;
static struct vnodeopv_entry_desc smbfs_vnodeop_entries[] = {
@ -117,10 +115,8 @@ static struct vnodeopv_entry_desc smbfs_vnodeop_entries[] = {
{ &vop_strategy_desc, (vop_t *) smbfs_strategy },
{ &vop_symlink_desc, (vop_t *) smbfs_symlink },
{ &vop_write_desc, (vop_t *) smbfs_write },
#ifndef FB_RELENG3
{ &vop_getextattr_desc, (vop_t *) smbfs_getextattr },
/* { &vop_setextattr_desc, (vop_t *) smbfs_setextattr },*/
#endif
{ NULL, NULL }
};

View File

@ -90,9 +90,6 @@ static struct cdevsw nsmb_cdevsw = {
.d_ioctl = nsmb_dev_ioctl,
.d_name = NSMB_NAME,
.d_maj = NSMB_MAJOR,
#ifndef FB_CURRENT
/* bmaj */ -1
#endif
};
static eventhandler_tag nsmb_dev_tag;

View File

@ -42,8 +42,6 @@
MALLOC_DECLARE(M_SMBTEMP);
#endif
#define FB_CURRENT
#define SMBERROR(format, args...) printf("%s: "format, __func__ ,## args)
#define SMBPANIC(format, args...) printf("%s: "format, __func__ ,## args)