From owner-svn-src-head@FreeBSD.ORG Thu Dec 3 18:16:15 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5904F1065670; Thu, 3 Dec 2009 18:16:15 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2E9218FC1E; Thu, 3 Dec 2009 18:16:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nB3IGF32021913; Thu, 3 Dec 2009 18:16:15 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB3IGFb8021911; Thu, 3 Dec 2009 18:16:15 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <200912031816.nB3IGFb8021911@svn.freebsd.org> From: Edward Tomasz Napierala Date: Thu, 3 Dec 2009 18:16:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200071 - head/sys/gnu/fs/reiserfs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 18:16:15 -0000 Author: trasz Date: Thu Dec 3 18:16:14 2009 New Revision: 200071 URL: http://svn.freebsd.org/changeset/base/200071 Log: Remove unused code. Modified: head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c Modified: head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c ============================================================================== --- head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c Thu Dec 3 18:13:47 2009 (r200070) +++ head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c Thu Dec 3 18:16:14 2009 (r200071) @@ -429,40 +429,11 @@ reiserfs_mountfs(struct vnode *devvp, st struct reiserfs_super_block *rs; struct cdev *dev = devvp->v_rdev; -#if (__FreeBSD_version >= 600000) struct g_consumer *cp; struct bufobj *bo; -#endif //ronly = (mp->mnt_flag & MNT_RDONLY) != 0; -#if (__FreeBSD_version < 600000) - /* - * Disallow multiple mounts of the same device. - * Disallow mounting of a device that is currently in use - * (except for root, which might share swap device for miniroot). - * Flush out any old buffers remaining from a previous use. - */ - if ((error = vfs_mountedon(devvp)) != 0) - return (error); - if (vcount(devvp) > 1) - return (EBUSY); - - error = vinvalbuf(devvp, V_SAVE, td->td_ucred, td, 0, 0); - if (error) { - VOP_UNLOCK(devvp, 0); - return (error); - } - - /* - * Open the device in read-only, 'cause we don't support write - * for now - */ - error = VOP_OPEN(devvp, FREAD, FSCRED, td, NULL); - VOP_UNLOCK(devvp, 0); - if (error) - return (error); -#else DROP_GIANT(); g_topology_lock(); error = g_vfs_open(devvp, &cp, "reiserfs", /* read-only */ 0); @@ -475,7 +446,6 @@ reiserfs_mountfs(struct vnode *devvp, st bo = &devvp->v_bufobj; bo->bo_private = cp; bo->bo_ops = g_vfs_bufops; -#endif if (devvp->v_rdev->si_iosize_max != 0) mp->mnt_iosize_max = devvp->v_rdev->si_iosize_max; @@ -500,10 +470,8 @@ reiserfs_mountfs(struct vnode *devvp, st rmp->rm_mountp = mp; rmp->rm_devvp = devvp; rmp->rm_dev = dev; -#if (__FreeBSD_version >= 600000) rmp->rm_bo = &devvp->v_bufobj; rmp->rm_cp = cp; -#endif /* Set default values for options: non-aggressive tails */ REISERFS_SB(sbi)->s_mount_opt = (1 << REISERFS_SMALLTAIL); @@ -630,9 +598,6 @@ out: } } -#if (__FreeBSD_version < 600000) - (void)VOP_CLOSE(devvp, FREAD, NOCRED, td); -#else if (cp != NULL) { DROP_GIANT(); g_topology_lock(); @@ -640,7 +605,6 @@ out: g_topology_unlock(); PICKUP_GIANT(); } -#endif if (sbi) free(sbi, M_REISERFSMNT);