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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
fs
/
ext3
/
super.c
diff --git
a/fs/ext3/super.c
b/fs/ext3/super.c
index
cf48f61
..
27c0fe3
100644
(file)
--- a/
fs/ext3/super.c
+++ b/
fs/ext3/super.c
@@
-356,7
+356,7
@@
static int ext3_blkdev_remove(struct ext3_sb_info *sbi)
bdev = sbi->journal_bdev;
if (bdev) {
ret = ext3_blkdev_put(bdev);
bdev = sbi->journal_bdev;
if (bdev) {
ret = ext3_blkdev_put(bdev);
- sbi->journal_bdev =
0
;
+ sbi->journal_bdev =
NULL
;
}
return ret;
}
}
return ret;
}
@@
-724,6
+724,11
@@
static int parse_options (char * options, struct super_block *sb,
break;
#ifndef CONFIG_INOXID_NONE
case Opt_tagxid:
break;
#ifndef CONFIG_INOXID_NONE
case Opt_tagxid:
+ if (is_remount) {
+ printk(KERN_ERR "EXT3-fs: cannot specify "
+ "tagxid on remount\n");
+ return 0;
+ }
set_opt (sbi->s_mount_opt, TAG_XID);
break;
#endif
set_opt (sbi->s_mount_opt, TAG_XID);
break;
#endif
@@
-1207,7
+1212,7
@@
static unsigned long descriptor_loc(struct super_block *sb,
static int ext3_fill_super (struct super_block *sb, void *data, int silent)
{
struct buffer_head * bh;
static int ext3_fill_super (struct super_block *sb, void *data, int silent)
{
struct buffer_head * bh;
- struct ext3_super_block *es =
0
;
+ struct ext3_super_block *es =
NULL
;
struct ext3_sb_info *sbi;
unsigned long block;
unsigned long sb_block = get_sb_block(&data);
struct ext3_sb_info *sbi;
unsigned long block;
unsigned long sb_block = get_sb_block(&data);
@@
-1481,7
+1486,7
@@
static int ext3_fill_super (struct super_block *sb, void *data, int silent)
#endif
INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
#endif
INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
- sb->s_root =
0
;
+ sb->s_root =
NULL
;
needs_recovery = (es->s_last_orphan != 0 ||
EXT3_HAS_INCOMPAT_FEATURE(sb,
needs_recovery = (es->s_last_orphan != 0 ||
EXT3_HAS_INCOMPAT_FEATURE(sb,