git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
minix
/
inode.c
diff --git
a/fs/minix/inode.c
b/fs/minix/inode.c
index
3f18c21
..
2dcccf1
100644
(file)
--- a/
fs/minix/inode.c
+++ b/
fs/minix/inode.c
@@
-24,6
+24,7
@@
static int minix_remount (struct super_block * sb, int * flags, char * data);
static void minix_delete_inode(struct inode *inode)
{
static void minix_delete_inode(struct inode *inode)
{
+ truncate_inode_pages(&inode->i_data, 0);
inode->i_size = 0;
minix_truncate(inode);
minix_free_inode(inode);
inode->i_size = 0;
minix_truncate(inode);
minix_free_inode(inode);
@@
-79,7
+80,8
@@
static int init_inodecache(void)
{
minix_inode_cachep = kmem_cache_create("minix_inode_cache",
sizeof(struct minix_inode_info),
{
minix_inode_cachep = kmem_cache_create("minix_inode_cache",
sizeof(struct minix_inode_info),
- 0, SLAB_RECLAIM_ACCOUNT,
+ 0, (SLAB_RECLAIM_ACCOUNT|
+ SLAB_MEM_SPREAD),
init_once, NULL);
if (minix_inode_cachep == NULL)
return -ENOMEM;
init_once, NULL);
if (minix_inode_cachep == NULL)
return -ENOMEM;
@@
-125,11
+127,11
@@
static int minix_remount (struct super_block * sb, int * flags, char * data)
mark_buffer_dirty(sbi->s_sbh);
if (!(sbi->s_mount_state & MINIX_VALID_FS))
mark_buffer_dirty(sbi->s_sbh);
if (!(sbi->s_mount_state & MINIX_VALID_FS))
- printk
("MINIX-fs warning: remounting unchecked fs, "
- "running fsck is recommended
.
\n");
+ printk("MINIX-fs warning: remounting unchecked fs, "
+ "running fsck is recommended\n");
else if ((sbi->s_mount_state & MINIX_ERROR_FS))
else if ((sbi->s_mount_state & MINIX_ERROR_FS))
- printk
("MINIX-fs warning: remounting fs with errors, "
- "running fsck is recommended
.
\n");
+ printk("MINIX-fs warning: remounting fs with errors, "
+ "running fsck is recommended\n");
}
return 0;
}
}
return 0;
}
@@
-243,11
+245,11
@@
static int minix_fill_super(struct super_block *s, void *data, int silent)
mark_buffer_dirty(bh);
}
if (!(sbi->s_mount_state & MINIX_VALID_FS))
mark_buffer_dirty(bh);
}
if (!(sbi->s_mount_state & MINIX_VALID_FS))
- printk
("MINIX-fs: mounting unchecked file system, "
- "running fsck is recommended
.
\n");
+ printk("MINIX-fs: mounting unchecked file system, "
+ "running fsck is recommended\n");
else if (sbi->s_mount_state & MINIX_ERROR_FS)
else if (sbi->s_mount_state & MINIX_ERROR_FS)
- printk
("MINIX-fs: mounting file system with errors, "
- "running fsck is recommended
.
\n");
+ printk("MINIX-fs: mounting file system with errors, "
+ "running fsck is recommended\n");
return 0;
out_iput:
return 0;
out_iput:
@@
-271,19
+273,19
@@
out_no_bitmap:
out_no_map:
if (!silent)
out_no_map:
if (!silent)
- printk
("MINIX-fs: can't allocate map\n");
+ printk("MINIX-fs: can't allocate map\n");
goto out_release;
out_no_fs:
if (!silent)
goto out_release;
out_no_fs:
if (!silent)
- printk("VFS: Can't find a Minix or Minix V2 filesystem
on device
"
-
"%s.
\n", s->s_id);
+ printk("VFS: Can't find a Minix or Minix V2 filesystem "
+
"on device %s
\n", s->s_id);
out_release:
brelse(bh);
goto out;
out_bad_hblock:
out_release:
brelse(bh);
goto out;
out_bad_hblock:
- printk("MINIX-fs: blocksize too small for device
.
\n");
+ printk("MINIX-fs: blocksize too small for device\n");
goto out;
out_bad_sb:
goto out;
out_bad_sb:
@@
-522,7
+524,7
@@
int minix_sync_inode(struct inode * inode)
sync_dirty_buffer(bh);
if (buffer_req(bh) && !buffer_uptodate(bh))
{
sync_dirty_buffer(bh);
if (buffer_req(bh) && !buffer_uptodate(bh))
{
- printk
("IO error syncing minix inode [%s:%08lx]\n",
+ printk("IO error syncing minix inode [%s:%08lx]\n",
inode->i_sb->s_id, inode->i_ino);
err = -1;
}
inode->i_sb->s_id, inode->i_ino);
err = -1;
}