Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932161AbWCaRws (ORCPT ); Fri, 31 Mar 2006 12:52:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932162AbWCaRws (ORCPT ); Fri, 31 Mar 2006 12:52:48 -0500 Received: from a1819.adsl.pool.eol.hu ([81.0.120.41]:21723 "EHLO dorka.pomaz.szeredi.hu") by vger.kernel.org with ESMTP id S932161AbWCaRwr (ORCPT ); Fri, 31 Mar 2006 12:52:47 -0500 To: akpm@osdl.org CC: linux-kernel@vger.kernel.org In-reply-to: (message from Miklos Szeredi on Fri, 31 Mar 2006 19:45:19 +0200) Subject: [PATCH 4/10] fuse: add O_NONBLOCK support to FUSE device References: Message-Id: From: Miklos Szeredi Date: Fri, 31 Mar 2006 19:52:31 +0200 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1041 Lines: 31 From: Jeff Dike I don't like duplicating the connected and list_empty tests in fuse_dev_readv, but this seemed cleaner than adding the f_flags test to request_wait. Signed-off-by: Jeff Dike Signed-off-by: Miklos Szeredi Index: linux/fs/fuse/dev.c =================================================================== --- linux.orig/fs/fuse/dev.c 2006-03-31 18:55:31.000000000 +0200 +++ linux/fs/fuse/dev.c 2006-03-31 18:55:31.000000000 +0200 @@ -619,6 +619,12 @@ static ssize_t fuse_dev_readv(struct fil err = -EPERM; if (!fc) goto err_unlock; + + err = -EAGAIN; + if((file->f_flags & O_NONBLOCK) && fc->connected && + list_empty(&fc->pending)) + goto err_unlock; + request_wait(fc); err = -ENODEV; if (!fc->connected) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/