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 <t-sato@xxxxxxxxxxxxx> Signed-off-by: Masayuki Hamaguchi <m-hamaguchi@xxxxxxxxxxxxx> --- 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 *); -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html