[Midnightbsd-cvs] src [9994] trunk/sys/gnu/fs/reiserfs: sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 26 18:13:38 EDT 2018
Revision: 9994
http://svnweb.midnightbsd.org/src/?rev=9994
Author: laffer1
Date: 2018-05-26 18:13:37 -0400 (Sat, 26 May 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/sys/gnu/fs/reiserfs/README
trunk/sys/gnu/fs/reiserfs/reiserfs_fs.h
trunk/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
trunk/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h
trunk/sys/gnu/fs/reiserfs/reiserfs_inode.c
trunk/sys/gnu/fs/reiserfs/reiserfs_item_ops.c
trunk/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
Property Changed:
----------------
trunk/sys/gnu/fs/reiserfs/README
Modified: trunk/sys/gnu/fs/reiserfs/README
===================================================================
--- trunk/sys/gnu/fs/reiserfs/README 2018-05-26 22:09:11 UTC (rev 9993)
+++ trunk/sys/gnu/fs/reiserfs/README 2018-05-26 22:13:37 UTC (rev 9994)
@@ -1,4 +1,5 @@
-$FreeBSD$
+$MidnightBSD$
+$FreeBSD: stable/10/sys/gnu/fs/reiserfs/README 147476 2005-06-18 17:10:50Z dumbbell $
[LICENSING]
Property changes on: trunk/sys/gnu/fs/reiserfs/README
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/gnu/fs/reiserfs/reiserfs_fs.h
===================================================================
--- trunk/sys/gnu/fs/reiserfs/reiserfs_fs.h 2018-05-26 22:09:11 UTC (rev 9993)
+++ trunk/sys/gnu/fs/reiserfs/reiserfs_fs.h 2018-05-26 22:13:37 UTC (rev 9994)
@@ -1,11 +1,11 @@
-/* $MidnightBSD: src/sys/gnu/fs/reiserfs/reiserfs_fs.h,v 1.2 2008/12/03 00:25:53 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright 2000 Hans Reiser
* See README for licensing and copyright details
*
- * Ported to FreeBSD by Jean-S\xE9bastien P\xE9dron <jspedron at club-internet.fr>
+ * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron at club-internet.fr>
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/gnu/fs/reiserfs/reiserfs_fs.h 230132 2012-01-15 13:23:18Z uqs $
*/
#ifndef _GNU_REISERFS_REISERFS_FS_H
Modified: trunk/sys/gnu/fs/reiserfs/reiserfs_fs_i.h
===================================================================
--- trunk/sys/gnu/fs/reiserfs/reiserfs_fs_i.h 2018-05-26 22:09:11 UTC (rev 9993)
+++ trunk/sys/gnu/fs/reiserfs/reiserfs_fs_i.h 2018-05-26 22:13:37 UTC (rev 9994)
@@ -1,11 +1,11 @@
-/* $MidnightBSD: src/sys/gnu/fs/reiserfs/reiserfs_fs_i.h,v 1.2 2008/12/03 00:25:53 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright 2000 Hans Reiser
* See README for licensing and copyright details
*
- * Ported to FreeBSD by Jean-S\xE9bastien P\xE9dron <jspedron at club-internet.fr>
+ * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron at club-internet.fr>
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/gnu/fs/reiserfs/reiserfs_fs_i.h 230132 2012-01-15 13:23:18Z uqs $
*/
#ifndef _GNU_REISERFS_REISERFS_FS_I_H
Modified: trunk/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h
===================================================================
--- trunk/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h 2018-05-26 22:09:11 UTC (rev 9993)
+++ trunk/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h 2018-05-26 22:13:37 UTC (rev 9994)
@@ -1,11 +1,11 @@
-/* $MidnightBSD: src/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h,v 1.2 2008/12/03 00:25:53 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*
* Copyright 2000 Hans Reiser
* See README for licensing and copyright details
*
- * Ported to FreeBSD by Jean-S\xE9bastien P\xE9dron <jspedron at club-internet.fr>
+ * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron at club-internet.fr>
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h 230132 2012-01-15 13:23:18Z uqs $
*/
#ifndef _GNU_REISERFS_REISERFS_FS_SB_H
Modified: trunk/sys/gnu/fs/reiserfs/reiserfs_inode.c
===================================================================
--- trunk/sys/gnu/fs/reiserfs/reiserfs_inode.c 2018-05-26 22:09:11 UTC (rev 9993)
+++ trunk/sys/gnu/fs/reiserfs/reiserfs_inode.c 2018-05-26 22:13:37 UTC (rev 9994)
@@ -1,11 +1,11 @@
-/* $MidnightBSD: src/sys/gnu/fs/reiserfs/reiserfs_inode.c,v 1.2 2008/12/03 00:25:53 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright 2000 Hans Reiser
* See README for licensing and copyright details
*
- * Ported to FreeBSD by Jean-S\xE9bastien P\xE9dron <dumbbell at FreeBSD.org>
+ * Ported to FreeBSD by Jean-Sébastien Pédron <dumbbell at FreeBSD.org>
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/gnu/fs/reiserfs/reiserfs_inode.c 243311 2012-11-19 22:43:45Z attilio $
*/
#include <gnu/fs/reiserfs/reiserfs_fs.h>
@@ -105,12 +105,10 @@
{
int error;
struct vnode *vp;
- struct thread *td;
struct reiserfs_node *ip;
error = 0;
vp = ap->a_vp;
- td = ap->a_td;
ip = VTOI(vp);
reiserfs_log(LOG_DEBUG, "deactivating inode used %d times\n",
@@ -130,7 +128,7 @@
*/
if (ip->i_mode == 0) {
reiserfs_log(LOG_DEBUG, "recyling\n");
- vrecycle(vp, td);
+ vrecycle(vp);
}
return (error);
@@ -760,13 +758,6 @@
rmp = VFSTOREISERFS(mp);
dev = rmp->rm_dev;
- /*
- * If this malloc() is performed after the getnewvnode() it might
- * block, leaving a vnode with a NULL v_data to be found by
- * reiserfs_sync() if a sync happens to fire right then, which
- * will cause a panic because reiserfs_sync() blindly dereferences
- * vp->v_data (as well it should).
- */
reiserfs_log(LOG_DEBUG, "malloc(struct reiserfs_node)\n");
ip = malloc(sizeof(struct reiserfs_node), M_REISERFSNODE,
M_WAITOK | M_ZERO);
Modified: trunk/sys/gnu/fs/reiserfs/reiserfs_item_ops.c
===================================================================
--- trunk/sys/gnu/fs/reiserfs/reiserfs_item_ops.c 2018-05-26 22:09:11 UTC (rev 9993)
+++ trunk/sys/gnu/fs/reiserfs/reiserfs_item_ops.c 2018-05-26 22:13:37 UTC (rev 9994)
@@ -1,11 +1,11 @@
-/* $MidnightBSD: src/sys/gnu/fs/reiserfs/reiserfs_item_ops.c,v 1.2 2008/12/03 00:25:53 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright 2000 Hans Reiser
* See README for licensing and copyright details
*
- * Ported to FreeBSD by Jean-S\xE9bastien P\xE9dron <jspedron at club-internet.fr>
+ * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron at club-internet.fr>
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/gnu/fs/reiserfs/reiserfs_item_ops.c 230132 2012-01-15 13:23:18Z uqs $
*/
#include <gnu/fs/reiserfs/reiserfs_fs.h>
Modified: trunk/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
===================================================================
--- trunk/sys/gnu/fs/reiserfs/reiserfs_vfsops.c 2018-05-26 22:09:11 UTC (rev 9993)
+++ trunk/sys/gnu/fs/reiserfs/reiserfs_vfsops.c 2018-05-26 22:13:37 UTC (rev 9994)
@@ -3,9 +3,9 @@
* Copyright 2000 Hans Reiser
* See README for licensing and copyright details
*
- * Ported to FreeBSD by Jean-S\xE9bastien P\xE9dron <jspedron at club-internet.fr>
+ * Ported to FreeBSD by Jean-Sébastien Pédron <jspedron at club-internet.fr>
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/gnu/fs/reiserfs/reiserfs_vfsops.c 288985 2015-10-07 09:29:42Z avatar $
*/
#include <gnu/fs/reiserfs/reiserfs_fs.h>
@@ -581,7 +581,6 @@
mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
MNT_ILOCK(mp);
mp->mnt_flag |= MNT_LOCAL;
- mp->mnt_kern_flag |= MNTK_MPSAFE;
MNT_IUNLOCK(mp);
#if defined(si_mountpoint)
devvp->v_rdev->si_mountpoint = mp;
@@ -962,8 +961,8 @@
key.on_disk_key.k_objectid, key.on_disk_key.k_dir_id);
retval = search_by_entry_key(sbi, &key, &path, &de);
if (retval == IO_ERROR) {
- pathrelse(&path);
- return (UNSET_HASH);
+ hash = UNSET_HASH;
+ break;
}
if (retval == NAME_NOT_FOUND)
de.de_entry_num--;
@@ -1024,6 +1023,7 @@
}
} while (0);
+ free(ip, M_REISERFSNODE);
pathrelse(&path);
return (hash);
}
More information about the Midnightbsd-cvs
mailing list