From owner-p4-projects@FreeBSD.ORG Sun May 29 11:09:36 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D45D1065670; Sun, 29 May 2011 11:09:36 +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 4F3B3106566B for ; Sun, 29 May 2011 11:09:36 +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 23E8F8FC27 for ; Sun, 29 May 2011 11:09:36 +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 p4TB9aud081424 for ; Sun, 29 May 2011 11:09:36 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4TB9aUo081421 for perforce@freebsd.org; Sun, 29 May 2011 11:09:36 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 29 May 2011 11:09:36 GMT Message-Id: <201105291109.p4TB9aUo081421@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 193905 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 11:09:36 -0000 http://p4web.freebsd.org/@@193905?ac=10 Change 193905 by ilya@ilya_triton2011 on 2011/05/29 11:08:54 Rename fuse_send_init() and fuse_init_handler() Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#3 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#4 edit .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#7 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ #include "fuse_internal.h" int -fuse_init_handler(struct fuse_ticket *tick, struct uio *uio) +fuse_internal_init_callback(struct fuse_ticket *tick, struct uio *uio) { int err = 0; struct fuse_data *data = tick->tk_data; @@ -85,7 +85,7 @@ } void -fuse_send_init(struct fuse_data *data, struct thread *td) +fuse_internal_send_init(struct fuse_data *data, struct thread *td) { #if FUSE_KERNELABI_GEQ(7, 5) struct fuse_init_in *fiii; @@ -100,6 +100,6 @@ fiii->major = FUSE_KERNEL_VERSION; fiii->minor = FUSE_KERNEL_MINOR_VERSION; - fuse_insert_callback(fdi.tick, fuse_init_handler); + fuse_insert_callback(fdi.tick, fuse_internal_init_callback); fuse_insert_message(fdi.tick); } ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#4 (text+ko) ==== @@ -36,7 +36,9 @@ }; -int fuse_init_handler(struct fuse_ticket *tick, struct uio *uio); -void fuse_send_init(struct fuse_data *data, struct thread *td); +/* fuse start/stop */ + +int fuse_internal_init_callback(struct fuse_ticket *tick, struct uio *uio); +void fuse_internal_send_init(struct fuse_data *data, struct thread *td); #endif /* _FUSE_INTERNAL_H_ */ ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#7 (text+ko) ==== @@ -415,7 +415,7 @@ if (! secondary) /* Now handshaking with daemon */ - fuse_send_init(data, td); + fuse_internal_send_init(data, td); out: if (err ) {