Mon Dec 14 19:36:57 2009 UTC ()
Revert previous version bump which should not have been in the supplied
patch. This maintains compatibility between 5.0 and 5.1 (at the cost of
needing userland libraries recompiled if one's been tracking netbsd-5).


(sborrill)
diff -r1.65.20.1 -r1.65.20.2 src/sys/fs/puffs/puffs_msgif.h
cvs diff -r1.65.20.1 -r1.65.20.2 src/sys/fs/puffs/puffs_msgif.h (expand / switch to unified diff)

--- src/sys/fs/puffs/puffs_msgif.h 2009/10/18 12:46:07 1.65.20.1
+++ src/sys/fs/puffs/puffs_msgif.h 2009/12/14 19:36:57 1.65.20.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: puffs_msgif.h,v 1.65.20.1 2009/10/18 12:46:07 sborrill Exp $ */ 1/* $NetBSD: puffs_msgif.h,v 1.65.20.2 2009/12/14 19:36:57 sborrill Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Development of this software was supported by the 6 * Development of this software was supported by the
7 * Google Summer of Code program and the Ulla Tuominen Foundation. 7 * Google Summer of Code program and the Ulla Tuominen Foundation.
8 * The Google SoC project was mentored by Bill Studenmund. 8 * The Google SoC project was mentored by Bill Studenmund.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -92,27 +92,27 @@ enum { @@ -92,27 +92,27 @@ enum {
92#define PUFFS_VN_MAX PUFFS_VN_SETEXTATTR 92#define PUFFS_VN_MAX PUFFS_VN_SETEXTATTR
93 93
94/* 94/*
95 * These signal invalid parameters the file system returned. 95 * These signal invalid parameters the file system returned.
96 */ 96 */
97enum { 97enum {
98 PUFFS_ERR_MAKENODE, PUFFS_ERR_LOOKUP, PUFFS_ERR_READDIR, 98 PUFFS_ERR_MAKENODE, PUFFS_ERR_LOOKUP, PUFFS_ERR_READDIR,
99 PUFFS_ERR_READLINK, PUFFS_ERR_READ, PUFFS_ERR_WRITE, 99 PUFFS_ERR_READLINK, PUFFS_ERR_READ, PUFFS_ERR_WRITE,
100 PUFFS_ERR_VPTOFH, PUFFS_ERR_ERROR 100 PUFFS_ERR_VPTOFH, PUFFS_ERR_ERROR
101}; 101};
102#define PUFFS_ERR_MAX PUFFS_ERR_VPTOFH 102#define PUFFS_ERR_MAX PUFFS_ERR_VPTOFH
103 103
104#define PUFFSDEVELVERS 0x80000000 104#define PUFFSDEVELVERS 0x80000000
105#define PUFFSVERSION 28 105#define PUFFSVERSION 26
106#define PUFFSNAMESIZE 32 106#define PUFFSNAMESIZE 32
107 107
108#define PUFFS_TYPEPREFIX "puffs|" 108#define PUFFS_TYPEPREFIX "puffs|"
109 109
110#define PUFFS_TYPELEN (_VFS_NAMELEN - (sizeof(PUFFS_TYPEPREFIX)+1)) 110#define PUFFS_TYPELEN (_VFS_NAMELEN - (sizeof(PUFFS_TYPEPREFIX)+1))
111#define PUFFS_NAMELEN (_VFS_MNAMELEN-1) 111#define PUFFS_NAMELEN (_VFS_MNAMELEN-1)
112 112
113/*  113/*
114 * Just a weak typedef for code clarity. Additionally, we have a 114 * Just a weak typedef for code clarity. Additionally, we have a
115 * more appropriate vanity type for puffs: 115 * more appropriate vanity type for puffs:
116 * <uep> it should be croissant, not cookie. 116 * <uep> it should be croissant, not cookie.
117 */ 117 */
118typedef void *puffs_cookie_t; 118typedef void *puffs_cookie_t;