From owner-p4-projects@FreeBSD.ORG Tue Apr 10 11:36:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E20D716A405; Tue, 10 Apr 2007 11:36:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B1B7816A403 for ; Tue, 10 Apr 2007 11:36:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A16E613C48A for ; Tue, 10 Apr 2007 11:36:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3ABaUKb077919 for ; Tue, 10 Apr 2007 11:36:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3ABaUJH077915 for perforce@freebsd.org; Tue, 10 Apr 2007 11:36:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 10 Apr 2007 11:36:30 GMT Message-Id: <200704101136.l3ABaUJH077915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 117828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2007 11:36:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=117828 Change 117828 by rwatson@rwatson_cinnamon_afs on 2007/04/10 11:36:13 FreeBSD build fixes for updates nnpfs files. Affected files ... .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-freebsd.c#4 edit .. //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-bsd.c#4 edit Differences ... ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_vfsops-freebsd.c#4 (text+ko) ==== @@ -60,9 +60,15 @@ .vop_default = &default_vnodeops, .vop_lookup = nnpfs_dead_lookup, .vop_reclaim = nnpfs_dead_reclaim, + + /* + * XXXRW: Need appropriate ifdef here. + */ +#if 0 .vop_lock = vop_stdlock, .vop_unlock = vop_stdunlock, .vop_islocked = vop_stdislocked, +#endif }; int @@ -161,9 +167,16 @@ .vfs_statfs = nnpfs_statfs, .vfs_sync = nnpfs_sync, .vfs_vget = nnpfs_vget_freebsd, + /* + * XXXRW: Do we need ifdef, or just not define them at all? + */ +#if 0 .vfs_fhtovp = nnpfs_fhtovp, +#endif .vfs_checkexp = nnpfs_checkexp, +#if 0 .vfs_vptofh = nnpfs_vptofh, +#endif .vfs_init = nnpfs_init }; /*VFS_SET(nnpfs_vfsops, arlannpfsdev, 0);*/ ==== //depot/projects/arla/sys/fs/nnpfs/nnpfs_vnodeops-bsd.c#4 (text+ko) ==== @@ -84,8 +84,11 @@ ret = nnpfs_open_common(ap->a_vp, ap->a_mode, ctx); #ifdef __FreeBSD__ + /* + * XXXRW: Need an ifdef for this? + */ if (!ret) - vnode_create_vobject_off(ap->a_vp, + vnode_create_vobject(ap->a_vp, nnpfs_vattr_get_size(&VNODE_TO_XNODE(ap->a_vp)->attr), ap->a_td); #endif @@ -138,7 +141,7 @@ #endif /* HAVE_VOP_CLOSE */ #if defined(HAVE_VOP_READ) && !defined(__NetBSD__) -int +static int nnpfs_read(struct vop_read_args * ap) /* vop_read { IN struct vnode *vp; @@ -152,7 +155,7 @@ #endif /* HAVE_VOP_READ */ #if defined(HAVE_VOP_WRITE) && !defined(__NetBSD__) -int +static int nnpfs_write(struct vop_write_args * ap) /* vop_write { IN struct vnode *vp; @@ -722,7 +725,7 @@ #endif /* HAVE_VOP_SYMLINK */ -int +static int nnpfs_readlink(struct vop_readlink_args * ap) /* struct vnode *vp, struct uio *uiop, @@ -1064,7 +1067,7 @@ #endif /* HAVE_VOP_MMAP */ #if defined(HAVE_VOP_BMAP) && !defined(__NetBSD__) -int +static int nnpfs_bmap(struct vop_bmap_args *ap) /* IN struct vnode *vp; IN daddr_t bn; @@ -1239,7 +1242,7 @@ #endif /* HAVE_VOP_ADVOCK */ #if defined(HAVE_VOP_REVOKE) && !defined(__NetBSD__) -int +static int nnpfs_revoke(struct vop_revoke_args *v) { #if defined(HAVE_KERNEL_GENFS_REVOKE) @@ -1474,9 +1477,15 @@ .vop_bmap = nnpfs_bmap, .vop_poll = nnpfs_poll, + +/* + * XXXRW: Do we need to ifdef this? + */ +#if 0 .vop_lock = nnpfs_lock, .vop_unlock = nnpfs_unlock, .vop_islocked = nnpfs_islocked, +#endif .vop_revoke = nnpfs_revoke, };