From owner-p4-projects@FreeBSD.ORG Sun May 29 10:59:42 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1230C106572A; Sun, 29 May 2011 10:59:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F80A1065672 for ; Sun, 29 May 2011 10:59:41 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 565968FC16 for ; Sun, 29 May 2011 10:59:41 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p4TAxfSx079506 for ; Sun, 29 May 2011 10:59:41 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4TAxfiU079503 for perforce@freebsd.org; Sun, 29 May 2011 10:59:41 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 29 May 2011 10:59:41 GMT Message-Id: <201105291059.p4TAxfiU079503@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 193895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 May 2011 10:59:42 -0000 http://p4web.freebsd.org/@@193895?ac=10 Change 193895 by ilya@ilya_triton2011 on 2011/05/29 10:59:31 Rename fuse device methods Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#2 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#2 (text+ko) ==== @@ -31,22 +31,22 @@ static __inline int fuse_ohead_audit(struct fuse_out_header *ohead, struct uio *uio); -static d_open_t fusedev_open; -static d_close_t fusedev_close; -static d_poll_t fusedev_poll; -static d_read_t fusedev_read; -static d_write_t fusedev_write; +static d_open_t fuse_device_open; +static d_close_t fuse_device_close; +static d_poll_t fuse_device_poll; +static d_read_t fuse_device_read; +static d_write_t fuse_device_write; -void fusedev_clone(void *arg, struct ucred *cred, char *name, +void fuse_device_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev); -static struct cdevsw fuse_cdevsw = { - .d_open = fusedev_open, - .d_close = fusedev_close, +static struct cdevsw fuse_device_cdevsw = { + .d_open = fuse_device_open, + .d_close = fuse_device_close, .d_name = "fuse", - .d_poll = fusedev_poll, - .d_read = fusedev_read, - .d_write = fusedev_write, + .d_poll = fuse_device_poll, + .d_read = fuse_device_read, + .d_write = fuse_device_write, .d_version = D_VERSION, #ifndef D_NEEDMINOR #define D_NEEDMINOR 0 @@ -78,7 +78,7 @@ * Resources are set up on a per-open basis */ static int -fusedev_open(struct cdev *dev, int oflags, int devtype, struct thread *td) +fuse_device_open(struct cdev *dev, int oflags, int devtype, struct thread *td) { struct fuse_data *fdata; @@ -152,7 +152,7 @@ } static int -fusedev_close(struct cdev *dev, int fflag, int devtype, struct thread *td) +fuse_device_close(struct cdev *dev, int fflag, int devtype, struct thread *td) { struct fuse_data *data; @@ -205,7 +205,7 @@ } int -fusedev_poll(struct cdev *dev, int events, struct thread *td) +fuse_device_poll(struct cdev *dev, int events, struct thread *td) { struct fuse_data *data; int revents = 0; @@ -229,12 +229,12 @@ } /* - * fusedev_read hangs on the queue of VFS messages. + * fuse_device_read hangs on the queue of VFS messages. * When it's notified that there is a new one, it picks that and * passes up to the daemon */ int -fusedev_read(struct cdev *dev, struct uio *uio, int ioflag) +fuse_device_read(struct cdev *dev, struct uio *uio, int ioflag) { int err = 0; struct fuse_data *data; @@ -339,7 +339,7 @@ } /* - * fusedev_read will drop "not owned" tickets + * fuse_device_read will drop "not owned" tickets * (used when the one who inserted the message thinks the daemon * won't aswer) */ @@ -372,13 +372,13 @@ } /* - * fusedev_write first reads the header sent by the daemon. + * fuse_device_write first reads the header sent by the daemon. * If that's OK, looks up ticket/callback node by the unique id seen in header. * If the callback node contains a handler function, the uio is passed over * that. */ static int -fusedev_write(struct cdev *dev, struct uio *uio, int ioflag) +fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) { #if _DEBUG_MSG static int counter=0; @@ -485,7 +485,7 @@ * boosted with a hack so that devices can be reused. */ void -fusedev_clone(void *arg, struct ucred *cred, char *name, int namelen, +fuse_device_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev) { /* @@ -542,9 +542,9 @@ } /* find any existing device, or allocate new unit number */ - i = clone_create(&fuseclones, &fuse_cdevsw, &unit, dev, 0); + i = clone_create(&fuseclones, &fuse_device_cdevsw, &unit, dev, 0); if (i) { - *dev = make_dev(&fuse_cdevsw, + *dev = make_dev(&fuse_device_cdevsw, #if __FreeBSD_version < 800062 unit2minor(unit), #else /* __FreeBSD_version >= 800062 */