From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: with ECARTIS (v1.0.0; list xfs); Mon, 22 Sep 2008 03:54:13 -0700 (PDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.12.11.20060308/8.12.11/SuSE Linux 0.7) with ESMTP id m8MAs7Yq014554 for ; Mon, 22 Sep 2008 03:54:09 -0700 Received: from tyo201.gate.nec.co.jp (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id CEFFF1BD16FF for ; Mon, 22 Sep 2008 03:55:39 -0700 (PDT) Received: from tyo201.gate.nec.co.jp (TYO201.gate.nec.co.jp [202.32.8.193]) by cuda.sgi.com with ESMTP id jCQj5PxJVhJVeubr for ; Mon, 22 Sep 2008 03:55:39 -0700 (PDT) Subject: [PATCH 1/10] VFS: Fix error handling of write_super_lockfs/unlockfs Message-Id: <20080922195526t-sato@mail.jp.nec.com> Mime-Version: 1.0 From: Takashi Sato Date: Mon, 22 Sep 2008 19:55:26 +0900 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: xfs-bounce@oss.sgi.com Errors-to: xfs-bounce@oss.sgi.com List-Id: xfs To: Andrew Morton , Christoph Hellwig , "linux-fsdevel@vger.kernel.org" , "dm-devel@redhat.com" , "viro@ZenIV.linux.org.uk" , "linux-ext4@vger.kernel.org" , "xfs@oss.sgi.com" , "axboe@kernel.dk" , "mtk.manpages@googlemail.com" Cc: "linux-kernel@vger.kernel.org" I've changed the type of write_super_lockfs and unlockfs from "void" to "int" so that they can return an error. Signed-off-by: Takashi Sato Signed-off-by: Masayuki Hamaguchi --- Documentation/filesystems/Locking | 4 ++-- Documentation/filesystems/vfs.txt | 4 ++-- include/linux/fs.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff -uprN -X linux-2.6.27-rc7.org/Documentation/dontdiff linux-2.6.27-rc7.org/Documentation/filesystems/Locking linux-2 .6.27-rc7-lockfs/Documentation/filesystems/Locking --- linux-2.6.27-rc7.org/Documentation/filesystems/Locking 2008-09-22 07:29:55.000000000 +0900 +++ linux-2.6.27-rc7-lockfs/Documentation/filesystems/Locking 2008-09-22 09:53:22.000000000 +0900 @@ -97,8 +97,8 @@ prototypes: void (*put_super) (struct super_block *); void (*write_super) (struct super_block *); int (*sync_fs)(struct super_block *sb, int wait); - void (*write_super_lockfs) (struct super_block *); - void (*unlockfs) (struct super_block *); + int (*write_super_lockfs) (struct super_block *); + int (*unlockfs) (struct super_block *); int (*statfs) (struct dentry *, struct kstatfs *); int (*remount_fs) (struct super_block *, int *, char *); void (*clear_inode) (struct inode *); diff -uprN -X linux-2.6.27-rc7.org/Documentation/dontdiff linux-2.6.27-rc7.org/Documentation/filesystems/vfs.txt linux-2 .6.27-rc7-lockfs/Documentation/filesystems/vfs.txt --- linux-2.6.27-rc7.org/Documentation/filesystems/vfs.txt 2008-09-22 07:29:55.000000000 +0900 +++ linux-2.6.27-rc7-lockfs/Documentation/filesystems/vfs.txt 2008-09-22 09:53:22.000000000 +0900 @@ -210,8 +210,8 @@ struct super_operations { void (*put_super) (struct super_block *); void (*write_super) (struct super_block *); int (*sync_fs)(struct super_block *sb, int wait); - void (*write_super_lockfs) (struct super_block *); - void (*unlockfs) (struct super_block *); + int (*write_super_lockfs) (struct super_block *); + int (*unlockfs) (struct super_block *); int (*statfs) (struct dentry *, struct kstatfs *); int (*remount_fs) (struct super_block *, int *, char *); void (*clear_inode) (struct inode *); diff -uprN -X linux-2.6.27-rc7.org/Documentation/dontdiff linux-2.6.27-rc7.org/include/linux/fs.h linux-2.6.27-rc7-lockf s/include/linux/fs.h --- linux-2.6.27-rc7.org/include/linux/fs.h 2008-09-22 07:29:55.000000000 +0900 +++ linux-2.6.27-rc7-lockfs/include/linux/fs.h 2008-09-22 09:53:46.000000000 +0900 @@ -1314,8 +1314,8 @@ struct super_operations { void (*put_super) (struct super_block *); void (*write_super) (struct super_block *); int (*sync_fs)(struct super_block *sb, int wait); - void (*write_super_lockfs) (struct super_block *); - void (*unlockfs) (struct super_block *); + int (*write_super_lockfs) (struct super_block *); + int (*unlockfs) (struct super_block *); int (*statfs) (struct dentry *, struct kstatfs *); int (*remount_fs) (struct super_block *, int *, char *); void (*clear_inode) (struct inode *);