summaryrefslogtreecommitdiffstats
path: root/fs/fat
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-07-29 03:58:24 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-07-29 03:58:24 +0000
commit1c5c0c934f91fbce2825acbb849e98781e774c1d (patch)
tree12b5ae03516d4103bc070e4579ae1f7f71c27d24 /fs/fat
parent4fe70c31de87823ac9e804f4795589ba74dc6971 (diff)
Merge with 2.1.47. Some more cleanup and module fixes.
Diffstat (limited to 'fs/fat')
-rw-r--r--fs/fat/inode.c12
-rw-r--r--fs/fat/misc.c2
2 files changed, 12 insertions, 2 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index e35722aff..8ffd91e3d 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -44,8 +44,18 @@ void fat_put_inode(struct inode *inode)
MSDOS_I(inode)->i_linked = NULL;
}
if (MSDOS_I(inode)->i_busy) fat_cache_inval_inode(inode);
- return;
}
+}
+
+void fat_delete_inode(struct inode *inode)
+{
+ struct inode *depend, *linked;
+ struct super_block *sb;
+
+ depend = MSDOS_I(inode)->i_depend;
+ linked = MSDOS_I(inode)->i_linked;
+ sb = inode->i_sb;
+
inode->i_size = 0;
fat_truncate(inode);
if (depend) {
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 034f62c1f..ee0df4a15 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -40,7 +40,7 @@ void fat_fs_panic(struct super_block *s,const char *msg)
not_ro = !(s->s_flags & MS_RDONLY);
if (not_ro) s->s_flags |= MS_RDONLY;
- printk("Filesystem panic (dev %s).", kdevname(s->s_dev));
+ printk("Filesystem panic (dev %s).\n %s\n", kdevname(s->s_dev), msg);
if (not_ro)
printk(" File system has been set read-only\n");
}