OS-5148 ftruncate at offset should emit proper events
Reviewed by: Bryan Cantrill <bryan@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Fix vnode.h mismerge
OS-3294 add support for inotify
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>

@@ -19,11 +19,11 @@
  * CDDL HEADER END
  */
 
 /*
  * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2014, Joyent, Inc. All rights reserved.
  */
 
 /*      Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T     */
 /*        All Rights Reserved   */
 

@@ -741,11 +741,13 @@
         VE_RENAME_DEST_DIR      = 7,    /* Rename with vnode as target dir */
         VE_MOUNTEDOVER  = 8,    /* File or Filesystem got mounted over vnode */
         VE_TRUNCATE = 9,        /* Truncate */
         VE_PRE_RENAME_SRC = 10, /* Pre-rename, with vnode as source */
         VE_PRE_RENAME_DEST = 11, /* Pre-rename, with vnode as target/dest. */
-        VE_PRE_RENAME_DEST_DIR = 12 /* Pre-rename with vnode as target dir */
+        VE_PRE_RENAME_DEST_DIR = 12, /* Pre-rename with vnode as target dir */
+        VE_RENAME_SRC_DIR = 13, /* Rename with vnode as source dir */
+        VE_RESIZE       = 14    /* Resize/truncate to non-zero offset */
 } vnevent_t;
 
 /*
  * Values for checking vnode open and map counts
  */

@@ -1296,20 +1298,22 @@
 void    vnevent_rename_dest(vnode_t *, vnode_t *, char *, caller_context_t *);
 void    vnevent_remove(vnode_t *, vnode_t *, char *, caller_context_t *);
 void    vnevent_rmdir(vnode_t *, vnode_t *, char *, caller_context_t *);
 void    vnevent_create(vnode_t *, caller_context_t *);
 void    vnevent_link(vnode_t *, caller_context_t *);
-void    vnevent_rename_dest_dir(vnode_t *, caller_context_t *ct);
+void    vnevent_rename_dest_dir(vnode_t *, vnode_t *, char *,
+    caller_context_t *ct);
 void    vnevent_mountedover(vnode_t *, caller_context_t *);
 void    vnevent_truncate(vnode_t *, caller_context_t *);
 int     vnevent_support(vnode_t *, caller_context_t *);
 void    vnevent_pre_rename_src(vnode_t *, vnode_t *, char *,
             caller_context_t *);
 void    vnevent_pre_rename_dest(vnode_t *, vnode_t *, char *,
             caller_context_t *);
 void    vnevent_pre_rename_dest_dir(vnode_t *, vnode_t *, char *,
             caller_context_t *);
+void    vnevent_resize(vnode_t *, caller_context_t *);
 
 /* Vnode specific data */
 void vsd_create(uint_t *, void (*)(void *));
 void vsd_destroy(uint_t *);
 void *vsd_get(vnode_t *, uint_t);