Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932212AbVK1TtS (ORCPT ); Mon, 28 Nov 2005 14:49:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932213AbVK1TtS (ORCPT ); Mon, 28 Nov 2005 14:49:18 -0500 Received: from adsl-80.mirage.euroweb.hu ([193.226.228.80]:17925 "EHLO dorka.pomaz.szeredi.hu") by vger.kernel.org with ESMTP id S932212AbVK1TtR (ORCPT ); Mon, 28 Nov 2005 14:49:17 -0500 To: akpm@osdl.org CC: linux-kernel@vger.kernel.org In-reply-to: (message from Miklos Szeredi on Mon, 28 Nov 2005 20:47:34 +0100) Subject: [PATCH 5/7] fuse: bump interface version References: Message-Id: From: Miklos Szeredi Date: Mon, 28 Nov 2005 20:49:01 +0100 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1956 Lines: 53 Change interface version to 7.4. Following changes will need backward compatibility support, so store the minor version returned by userspace. Signed-off-by: Miklos Szeredi --- Index: linux/fs/fuse/dev.c =================================================================== --- linux.orig/fs/fuse/dev.c 2005-11-22 14:45:54.000000000 +0100 +++ linux/fs/fuse/dev.c 2005-11-28 12:02:10.000000000 +0100 @@ -178,6 +178,8 @@ static void request_end(struct fuse_conn if (req->misc.init_in_out.major != FUSE_KERNEL_VERSION) fc->conn_error = 1; + fc->minor = req->misc.init_in_out.minor; + /* After INIT reply is received other requests can go out. So do (FUSE_MAX_OUTSTANDING - 1) number of up()s on outstanding_sem. The last up() is done in Index: linux/include/linux/fuse.h =================================================================== --- linux.orig/include/linux/fuse.h 2005-11-22 14:45:58.000000000 +0100 +++ linux/include/linux/fuse.h 2005-11-28 11:59:01.000000000 +0100 @@ -14,7 +14,7 @@ #define FUSE_KERNEL_VERSION 7 /** Minor version number of this interface */ -#define FUSE_KERNEL_MINOR_VERSION 3 +#define FUSE_KERNEL_MINOR_VERSION 4 /** The node ID of the root inode */ #define FUSE_ROOT_ID 1 Index: linux/fs/fuse/fuse_i.h =================================================================== --- linux.orig/fs/fuse/fuse_i.h 2005-11-22 14:45:54.000000000 +0100 +++ linux/fs/fuse/fuse_i.h 2005-11-28 12:02:36.000000000 +0100 @@ -272,6 +272,9 @@ struct fuse_conn { /** Is create not implemented by fs? */ unsigned no_create : 1; + /** Negotiated minor version */ + unsigned minor; + /** Backing dev info */ struct backing_dev_info bdi; }; - 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/