[src/trunk]: src/sys/ufs/lfs G/C unused pieces.

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d35dc37047af
branches:  trunk
changeset: 788805:d35dc37047af
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Jul 20 20:01:24 2013 +0000

description:
G/C unused pieces.

diffstat:

 sys/ufs/lfs/lfs_rename.c  |  55 +---------------------------------------------
 sys/ufs/lfs/ulfs_extern.h |   3 +-
 2 files changed, 3 insertions(+), 55 deletions(-)

diffs (107 lines):

diff -r 4e8d956d9827 -r d35dc37047af sys/ufs/lfs/lfs_rename.c
--- a/sys/ufs/lfs/lfs_rename.c  Sat Jul 20 19:59:31 2013 +0000
+++ b/sys/ufs/lfs/lfs_rename.c  Sat Jul 20 20:01:24 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_rename.c,v 1.1 2013/07/20 19:59:31 dholland Exp $  */
+/*     $NetBSD: lfs_rename.c,v 1.2 2013/07/20 20:01:24 dholland Exp $  */
 /*  from NetBSD: ufs_rename.c,v 1.6 2013/01/22 09:39:18 dholland Exp  */
 
 /*-
@@ -89,7 +89,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.1 2013/07/20 19:59:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.2 2013/07/20 20:01:24 dholland Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1100,19 +1100,6 @@
        return error;
 }
 
-static const struct genfs_rename_ops ulfs_genfs_rename_ops = {
-       .gro_directory_empty_p          = ulfs_gro_directory_empty_p,
-       .gro_rename_check_possible      = ulfs_gro_rename_check_possible,
-       .gro_rename_check_permitted     = ulfs_gro_rename_check_permitted,
-       .gro_remove_check_possible      = ulfs_gro_remove_check_possible,
-       .gro_remove_check_permitted     = ulfs_gro_remove_check_permitted,
-       .gro_rename                     = ulfs_gro_rename,
-       .gro_remove                     = ulfs_gro_remove,
-       .gro_lookup                     = ulfs_gro_lookup,
-       .gro_genealogy                  = ulfs_gro_genealogy,
-       .gro_lock_directory             = ulfs_gro_lock_directory,
-};
-
 static const struct genfs_rename_ops lfs_genfs_rename_ops = {
        .gro_directory_empty_p          = ulfs_gro_directory_empty_p,
        .gro_rename_check_possible      = ulfs_gro_rename_check_possible,
@@ -1127,33 +1114,6 @@
 };
 
 /*
- * ulfs_sane_rename: The hairiest vop, with the saner API.
- *
- * Arguments:
- *
- * . fdvp (from directory vnode),
- * . fcnp (from component name),
- * . tdvp (to directory vnode),
- * . tcnp (to component name),
- * . cred (credentials structure), and
- * . posixly_correct (flag for behaviour if target & source link same file).
- *
- * fdvp and tdvp may be the same, and must be referenced and unlocked.
- */
-static int
-ulfs_sane_rename(
-    struct vnode *fdvp, struct componentname *fcnp,
-    struct vnode *tdvp, struct componentname *tcnp,
-    kauth_cred_t cred, bool posixly_correct)
-{
-       struct ulfs_lookup_results fulr, tulr;
-
-       return genfs_sane_rename(&ulfs_genfs_rename_ops,
-           fdvp, fcnp, &fulr, tdvp, tcnp, &tulr,
-           cred, posixly_correct);
-}
-
-/*
  * lfs_sane_rename: The hairiest vop, with the saner API.
  *
  * Arguments:
@@ -1200,17 +1160,6 @@
 }
 
 /*
- * ulfs_rename: The hairiest vop, with the insanest API.  Defer to
- * genfs_insane_rename immediately.
- */
-int
-ulfs_rename(void *v)
-{
-
-       return genfs_insane_rename(v, &ulfs_sane_rename);
-}
-
-/*
  * lfs_rename: The hairiest vop, with the insanest API.  Defer to
  * genfs_insane_rename immediately.
  */
diff -r 4e8d956d9827 -r d35dc37047af sys/ufs/lfs/ulfs_extern.h
--- a/sys/ufs/lfs/ulfs_extern.h Sat Jul 20 19:59:31 2013 +0000
+++ b/sys/ufs/lfs/ulfs_extern.h Sat Jul 20 20:01:24 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_extern.h,v 1.7 2013/07/20 19:59:31 dholland Exp $ */
+/*     $NetBSD: ulfs_extern.h,v 1.8 2013/07/20 20:01:24 dholland Exp $ */
 /*  from NetBSD: ufs_extern.h,v 1.72 2012/05/09 00:21:18 riastradh Exp  */
 
 /*-
@@ -85,7 +85,6 @@
 int    ulfs_readdir(void *);
 int    ulfs_readlink(void *);
 int    ulfs_remove(void *);
-int    ulfs_rename(void *);
 int    ulfs_rmdir(void *);
 #define        ulfs_seek       genfs_seek
 #define        ulfs_poll       genfs_poll