Module Name: src
Committed By: jdolecek
Date: Tue Oct 24 22:27:43 UTC 2017
Modified Files:
src/sys/ufs/ufs [tls-maxphys]: ufs_vfsops.c
Log Message:
remove rebase merge artifacts
To generate a diff of this commit:
cvs rdiff -u -r1.51.2.3 -r1.51.2.4 src/sys/ufs/ufs/ufs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ufs/ufs_vfsops.c
diff -u src/sys/ufs/ufs/ufs_vfsops.c:1.51.2.3 src/sys/ufs/ufs/ufs_vfsops.c:1.51.2.4
--- src/sys/ufs/ufs/ufs_vfsops.c:1.51.2.3 Wed Aug 20 00:04:45 2014
+++ src/sys/ufs/ufs/ufs_vfsops.c Tue Oct 24 22:27:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_vfsops.c,v 1.51.2.3 2014/08/20 00:04:45 tls Exp $ */
+/* $NetBSD: ufs_vfsops.c,v 1.51.2.4 2017/10/24 22:27:42 jdolecek Exp $ */
/*
* Copyright (c) 1991, 1993, 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.51.2.3 2014/08/20 00:04:45 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.51.2.4 2017/10/24 22:27:42 jdolecek Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -99,7 +99,6 @@ ufs_root(struct mount *mp, struct vnode
}
/*
-<<<<<<< ufs_vfsops.c
* Get (from disk) and set (to mount structure) maximum I/O size
*/
@@ -130,7 +129,6 @@ ufs_update_maxphys(struct mount *mp)
}
/*
-=======
* Look up and return a vnode/inode pair by inode number.
*/
int
@@ -151,7 +149,6 @@ ufs_vget(struct mount *mp, ino_t ino, st
}
/*
->>>>>>> 1.53
* Do operations associated with quotas
*/
int
