From owner-svn-src-all@FreeBSD.ORG Sun Oct 20 20:52:08 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1A9F398C; Sun, 20 Oct 2013 20:52:08 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ED56A2EED; Sun, 20 Oct 2013 20:52:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KKq7T7065549; Sun, 20 Oct 2013 20:52:07 GMT (envelope-from mckusick@svn.freebsd.org) Received: (from mckusick@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KKq7A3065547; Sun, 20 Oct 2013 20:52:07 GMT (envelope-from mckusick@svn.freebsd.org) Message-Id: <201310202052.r9KKq7A3065547@svn.freebsd.org> From: Kirk McKusick Date: Sun, 20 Oct 2013 20:52:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256803 - in head/sys/ufs: ffs ufs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Oct 2013 20:52:08 -0000 Author: mckusick Date: Sun Oct 20 20:52:07 2013 New Revision: 256803 URL: http://svnweb.freebsd.org/changeset/base/256803 Log: Second of several cleanups to soft dependency implementation. Delete two unused functions in ffs_sofdep.c. No functional change. Tested by: Peter Holm and Scott Long Sponsored by: Netflix Modified: head/sys/ufs/ffs/ffs_softdep.c head/sys/ufs/ufs/ufs_extern.h Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Sun Oct 20 20:50:17 2013 (r256802) +++ head/sys/ufs/ffs/ffs_softdep.c Sun Oct 20 20:52:07 2013 (r256803) @@ -521,14 +521,6 @@ softdep_slowdown(vp) panic("softdep_slowdown called"); } -void -softdep_releasefile(ip) - struct inode *ip; /* inode with the zero effective link count */ -{ - - panic("softdep_releasefile called"); -} - int softdep_request_cleanup(fs, vp, cred, resource) struct fs *fs; @@ -4695,32 +4687,6 @@ softdep_revert_create(dp, ip) } /* - * Called to release the journal structures created by a failed dotdot link - * creation. Adjusts nlinkdelta for non-journaling softdep. - */ -void -softdep_revert_dotdot_link(dp, ip) - struct inode *dp; - struct inode *ip; -{ - struct inodedep *inodedep; - struct jaddref *jaddref; - struct vnode *dvp; - - dvp = ITOV(dp); - ACQUIRE_LOCK(&lk); - inodedep = inodedep_lookup_ip(dp); - if (DOINGSUJ(dvp)) { - jaddref = (struct jaddref *)TAILQ_LAST(&inodedep->id_inoreflst, - inoreflst); - KASSERT(jaddref->ja_parent == ip->i_number, - ("softdep_revert_dotdot_link: addref parent mismatch")); - cancel_jaddref(jaddref, inodedep, &inodedep->id_inowait); - } - FREE_LOCK(&lk); -} - -/* * Called to release the journal structures created by a failed link * addition. Adjusts nlinkdelta for non-journaling softdep. */ Modified: head/sys/ufs/ufs/ufs_extern.h ============================================================================== --- head/sys/ufs/ufs/ufs_extern.h Sun Oct 20 20:50:17 2013 (r256802) +++ head/sys/ufs/ufs/ufs_extern.h Sun Oct 20 20:52:07 2013 (r256803) @@ -98,7 +98,6 @@ void softdep_setup_remove(struct buf *,s void softdep_setup_directory_change(struct buf *, struct inode *, struct inode *, ino_t, int); void softdep_change_linkcnt(struct inode *); -void softdep_releasefile(struct inode *); int softdep_slowdown(struct vnode *); void softdep_setup_create(struct inode *, struct inode *); void softdep_setup_dotdot_link(struct inode *, struct inode *); @@ -107,7 +106,6 @@ void softdep_setup_mkdir(struct inode *, void softdep_setup_rmdir(struct inode *, struct inode *); void softdep_setup_unlink(struct inode *, struct inode *); void softdep_revert_create(struct inode *, struct inode *); -void softdep_revert_dotdot_link(struct inode *, struct inode *); void softdep_revert_link(struct inode *, struct inode *); void softdep_revert_mkdir(struct inode *, struct inode *); void softdep_revert_rmdir(struct inode *, struct inode *);