Sun Nov 18 18:42:03 2012 UTC ()
Pull up following revision(s) (requested by dholland in ticket #665):
	sys/sys/mount.h: revision 1.208
Fix the prototype of vfs_quotactl() implementations in VFS_PROTOS(),
since it's wrong there. This slipped by because the only
implementation is in ufs, which isn't under a VFS_PROTOS declaration.


(msaitoh)
diff -r1.207 -r1.207.2.1 src/sys/sys/mount.h
cvs diff -r1.207 -r1.207.2.1 src/sys/sys/mount.h (expand / switch to unified diff)

--- src/sys/sys/mount.h 2012/02/01 05:34:42 1.207
+++ src/sys/sys/mount.h 2012/11/18 18:42:03 1.207.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: mount.h,v 1.207 2012/02/01 05:34:42 dholland Exp $ */ 1/* $NetBSD: mount.h,v 1.207.2.1 2012/11/18 18:42:03 msaitoh Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1989, 1991, 1993 4 * Copyright (c) 1989, 1991, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -267,27 +267,27 @@ int VFS_SUSPENDCTL(struct mount *, int); @@ -267,27 +267,27 @@ int VFS_SUSPENDCTL(struct mount *, int);
267struct mbuf; 267struct mbuf;
268struct vnodeopv_desc; 268struct vnodeopv_desc;
269struct kauth_cred; 269struct kauth_cred;
270#endif 270#endif
271 271
272#define VFS_MAX_MOUNT_DATA 8192 272#define VFS_MAX_MOUNT_DATA 8192
273 273
274#define VFS_PROTOS(fsname) \ 274#define VFS_PROTOS(fsname) \
275int fsname##_mount(struct mount *, const char *, void *, \ 275int fsname##_mount(struct mount *, const char *, void *, \
276 size_t *); \ 276 size_t *); \
277int fsname##_start(struct mount *, int); \ 277int fsname##_start(struct mount *, int); \
278int fsname##_unmount(struct mount *, int); \ 278int fsname##_unmount(struct mount *, int); \
279int fsname##_root(struct mount *, struct vnode **); \ 279int fsname##_root(struct mount *, struct vnode **); \
280int fsname##_quotactl(struct mount *, int, struct quotactl_args *); \ 280int fsname##_quotactl(struct mount *, struct quotactl_args *); \
281int fsname##_statvfs(struct mount *, struct statvfs *); \ 281int fsname##_statvfs(struct mount *, struct statvfs *); \
282int fsname##_sync(struct mount *, int, struct kauth_cred *); \ 282int fsname##_sync(struct mount *, int, struct kauth_cred *); \
283int fsname##_vget(struct mount *, ino_t, struct vnode **); \ 283int fsname##_vget(struct mount *, ino_t, struct vnode **); \
284int fsname##_fhtovp(struct mount *, struct fid *, struct vnode **); \ 284int fsname##_fhtovp(struct mount *, struct fid *, struct vnode **); \
285int fsname##_vptofh(struct vnode *, struct fid *, size_t *); \ 285int fsname##_vptofh(struct vnode *, struct fid *, size_t *); \
286void fsname##_init(void); \ 286void fsname##_init(void); \
287void fsname##_reinit(void); \ 287void fsname##_reinit(void); \
288void fsname##_done(void); \ 288void fsname##_done(void); \
289int fsname##_mountroot(void); \ 289int fsname##_mountroot(void); \
290int fsname##_snapshot(struct mount *, struct vnode *, \ 290int fsname##_snapshot(struct mount *, struct vnode *, \
291 struct timespec *); \ 291 struct timespec *); \
292int fsname##_extattrctl(struct mount *, int, struct vnode *, int, \ 292int fsname##_extattrctl(struct mount *, int, struct vnode *, int, \
293 const char *); \ 293 const char *); \