summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2004-06-19 20:38:35 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-06-19 20:38:35 -0700
commitf51dc7a2a47aff78a05d65b6affccebd35fb68de (patch)
treeb129f1c1422b26bf497cd9e5923db3c050e894d1 /include/linux
parent74325fde44f58b6de42be9eed0ac31ba8c98dd8d (diff)
[PATCH] affs remount fixes
AFFS: Fix oops on write after remount (from Roman Zippel): - Allocate/free bitmap as necessary - Remove last uses of SF_READONLY Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/affs_fs.h3
-rw-r--r--include/linux/affs_fs_sb.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/affs_fs.h b/include/linux/affs_fs.h
index c849309b1131..5ba9d6205dc0 100644
--- a/include/linux/affs_fs.h
+++ b/include/linux/affs_fs.h
@@ -36,7 +36,8 @@ extern u32 affs_count_free_bits(u32 blocksize, const void *data);
extern u32 affs_count_free_blocks(struct super_block *s);
extern void affs_free_block(struct super_block *sb, u32 block);
extern u32 affs_alloc_block(struct inode *inode, u32 goal);
-extern int affs_init_bitmap(struct super_block *sb);
+extern int affs_init_bitmap(struct super_block *sb, int *flags);
+extern void affs_free_bitmap(struct super_block *sb);
/* namei.c */
diff --git a/include/linux/affs_fs_sb.h b/include/linux/affs_fs_sb.h
index d2f86715cf1c..d722befe1ced 100644
--- a/include/linux/affs_fs_sb.h
+++ b/include/linux/affs_fs_sb.h
@@ -47,7 +47,6 @@ struct affs_sb_info {
#define SF_OFS 0x0200 /* Old filesystem */
#define SF_PREFIX 0x0400 /* Buffer for prefix is allocated */
#define SF_VERBOSE 0x0800 /* Talk about fs when mounting */
-#define SF_READONLY 0x1000 /* Don't allow to remount rw */
/* short cut to get to the affs specific sb data */
static inline struct affs_sb_info *AFFS_SB(struct super_block *sb)