From owner-p4-projects@FreeBSD.ORG Sun May 29 11:08:31 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0A04106572B; Sun, 29 May 2011 11:08:30 +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 19D151065672 for ; Sun, 29 May 2011 11:08:30 +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 07EB18FC12 for ; Sun, 29 May 2011 11:08:30 +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 p4TB8T74081387 for ; Sun, 29 May 2011 11:08:29 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p4TB8TNI081384 for perforce@freebsd.org; Sun, 29 May 2011 11:08:29 GMT (envelope-from ilya@FreeBSD.org) Date: Sun, 29 May 2011 11:08:29 GMT Message-Id: <201105291108.p4TB8TNI081384@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 193904 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:08:31 -0000 http://p4web.freebsd.org/@@193904?ac=10 Change 193904 by ilya@ilya_triton2011 on 2011/05/29 11:08:17 fuse_internal.c reduce diffs Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#2 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#2 (text+ko) ==== @@ -28,71 +28,78 @@ int fuse_init_handler(struct fuse_ticket *tick, struct uio *uio) { - struct fuse_data *data = tick->tk_data; + int err = 0; + struct fuse_data *data = tick->tk_data; #if FUSE_KERNELABI_GEQ(7, 5) - struct fuse_init_out *fiio; + struct fuse_init_out *fiio; #else - struct fuse_init_in_out *fiio; + struct fuse_init_in_out *fiio; #endif - int err = 0; + + if ((err = tick->tk_aw_ohead.error)) { + goto out; + } - if ((err = tick->tk_aw_ohead.error)) - goto out; - if ((err = fticket_pull(tick, uio))) - goto out; + if ((err = fticket_pull(tick, uio))) { + goto out; + } - fiio = fticket_resp(tick)->base; + fiio = fticket_resp(tick)->base; - /* XXX is the following check adequate? */ - if (fiio->major < 7) { - DEBUG2G("userpace version too low\n"); - err = EPROTONOSUPPORT; - goto out; - } + /* XXX is the following check adequate? */ + if (fiio->major < 7) { + DEBUG2G("userpace version too low\n"); + err = EPROTONOSUPPORT; + goto out; + } - data->fuse_libabi_major = fiio->major; - data->fuse_libabi_minor = fiio->minor; + data->fuse_libabi_major = fiio->major; + data->fuse_libabi_minor = fiio->minor; - if (FUSE_KERNELABI_GEQ(7, 5) && fuse_libabi_geq(data, 7, 5)) { + if (FUSE_KERNELABI_GEQ(7, 5) && fuse_libabi_geq(data, 7, 5)) { #if FUSE_KERNELABI_GEQ(7, 5) - if (fticket_resp(tick)->len == sizeof(struct fuse_init_out)) - data->max_write = fiio->max_write; - else - err = EINVAL; + if (fticket_resp(tick)->len == sizeof(struct fuse_init_out)) { + data->max_write = fiio->max_write; + } else { + err = EINVAL; + } #endif - } else - /* Old fix values */ - data->max_write = 4096; + } else { + /* Old fix values */ + data->max_write = 4096; + } out: - fuse_ticket_drop(tick); - if (err) - fdata_kick_set(data); + fuse_ticket_drop(tick); + + if (err) { + fdata_kick_set(data); + } - mtx_lock(&data->ticket_mtx); - data->dataflag |= FSESS_INITED; - wakeup(&data->ticketer); - mtx_unlock(&data->ticket_mtx); + mtx_lock(&data->ticket_mtx); + data->dataflag |= FSESS_INITED; + wakeup(&data->ticketer); + mtx_unlock(&data->ticket_mtx); - return (0); + return (0); } void fuse_send_init(struct fuse_data *data, struct thread *td) { #if FUSE_KERNELABI_GEQ(7, 5) - struct fuse_init_in *fiii; + struct fuse_init_in *fiii; #else - struct fuse_init_in_out *fiii; + struct fuse_init_in_out *fiii; #endif - struct fuse_dispatcher fdi; + struct fuse_dispatcher fdi; - fdisp_init(&fdi, sizeof(*fiii)); - fdisp_make(&fdi, data->mp, FUSE_INIT, 0, td, NULL); - fiii = fdi.indata; - fiii->major = FUSE_KERNEL_VERSION; - fiii->minor = FUSE_KERNEL_MINOR_VERSION; + fdisp_init(&fdi, sizeof(*fiii)); + fdisp_make(&fdi, data->mp, FUSE_INIT, 0, td, NULL); + fiii = fdi.indata; + fiii->major = FUSE_KERNEL_VERSION; + fiii->minor = FUSE_KERNEL_MINOR_VERSION; - fuse_insert_callback(fdi.tick, fuse_init_handler); - fuse_insert_message(fdi.tick); + fuse_insert_callback(fdi.tick, fuse_init_handler); + fuse_insert_message(fdi.tick); }