Author: avg
Date: Fri Feb 24 07:53:56 2017
New Revision: 314194
URL: https://svnweb.freebsd.org/changeset/base/314194
Log:
zfs: clean up unused files and definitions
MFC after: 1 month
X-MFC after: r314048
Deleted:
head/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
head/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h
Modified:
head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
head/sys/cddl/compat/opensolaris/sys/pathname.h
head/sys/conf/files
head/sys/modules/zfs/Makefile
Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c Fri Feb 24
07:47:50 2017 (r314193)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c Fri Feb 24
07:53:56 2017 (r314194)
@@ -62,55 +62,3 @@ lookupnameat(char *dirname, enum uio_seg
vn_lock(startvp, ltype | LK_RETRY);
return (error);
}
-
-int
-traverse(vnode_t **cvpp, int lktype)
-{
- vnode_t *cvp;
- vnode_t *tvp;
- vfs_t *vfsp;
- int error;
-
- cvp = *cvpp;
- tvp = NULL;
-
- /*
- * If this vnode is mounted on, then we transparently indirect
- * to the vnode which is the root of the mounted file system.
- * Before we do this we must check that an unmount is not in
- * progress on this vnode.
- */
-
- for (;;) {
- /*
- * Reached the end of the mount chain?
- */
- vfsp = vn_mountedvfs(cvp);
- if (vfsp == NULL)
- break;
- error = vfs_busy(vfsp, 0);
-
- /*
- * tvp is NULL for *cvpp vnode, which we can't unlock.
- */
- if (tvp != NULL)
- vput(cvp);
- else
- vrele(cvp);
- if (error)
- return (error);
-
- /*
- * The read lock must be held across the call to VFS_ROOT() to
- * prevent a concurrent unmount from destroying the vfs.
- */
- error = VFS_ROOT(vfsp, lktype, &tvp);
- vfs_unbusy(vfsp);
- if (error != 0)
- return (error);
- cvp = tvp;
- }
-
- *cvpp = cvp;
- return (0);
-}
Modified: head/sys/cddl/compat/opensolaris/sys/pathname.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/pathname.h Fri Feb 24 07:47:50
2017 (r314193)
+++ head/sys/cddl/compat/opensolaris/sys/pathname.h Fri Feb 24 07:53:56
2017 (r314194)
@@ -34,20 +34,9 @@
#include <sys/param.h>
#include <sys/vnode.h>
-typedef struct pathname {
- char *pn_buf; /* underlying storage */
- char *pn_path; /* remaining pathname */
- size_t pn_pathlen; /* remaining length */
- size_t pn_bufsize; /* total size of pn_buf */
-} pathname_t;
-
-#define pn_alloc(pnp) panic("pn_alloc() called")
-#define pn_free(pnp) panic("pn_free() called")
-
int lookupname(char *, enum uio_seg, enum symfollow, vnode_t **, vnode_t **);
int lookupnameat(char *, enum uio_seg, enum symfollow, vnode_t **, vnode_t **,
vnode_t *);
-int traverse(vnode_t **, int);
#endif /* _KERNEL */
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Fri Feb 24 07:47:50 2017 (r314193)
+++ head/sys/conf/files Fri Feb 24 07:53:56 2017 (r314194)
@@ -158,7 +158,6 @@ cddl/contrib/opensolaris/common/zfs/zfs_
cddl/contrib/opensolaris/common/zfs/zfs_prop.c
optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/zfs/zpool_prop.c
optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/zfs/zprop_common.c
optional zfs compile-with "${ZFS_C}"
-cddl/contrib/opensolaris/uts/common/fs/gfs.c
optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/vnode.c
optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
optional zfs compile-with "${ZFS_C}"
cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c
optional zfs compile-with "${ZFS_C}"
Modified: head/sys/modules/zfs/Makefile
==============================================================================
--- head/sys/modules/zfs/Makefile Fri Feb 24 07:47:50 2017
(r314193)
+++ head/sys/modules/zfs/Makefile Fri Feb 24 07:53:56 2017
(r314194)
@@ -46,7 +46,6 @@ SRCS+= opensolaris_atomic.c
.endif
.PATH: ${SUNW}/uts/common/fs
-SRCS+= gfs.c
SRCS+= vnode.c
.PATH: ${SUNW}/uts/common/os
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
