diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-07 05:30:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-07 05:30:30 -0400 |
| commit | cce913178118b0b36742eb7544c2b38a0c957ee7 (patch) | |
| tree | 25a6d7b4e01fea2932e6e2962a75f7a3d8c19a4f /fs/nilfs2 | |
| parent | d9f599e1e6d019968b35d2dc63074b9e8964fa69 (diff) | |
| parent | 4fd38e4595e2f6c9d27732c042a0e16b2753049c (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Resolve patch dependency
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/nilfs2')
| -rw-r--r-- | fs/nilfs2/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index 0cdbc5e7655a..48145f505a6a 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c | |||
| @@ -749,6 +749,7 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent, | |||
| 749 | sb->s_export_op = &nilfs_export_ops; | 749 | sb->s_export_op = &nilfs_export_ops; |
| 750 | sb->s_root = NULL; | 750 | sb->s_root = NULL; |
| 751 | sb->s_time_gran = 1; | 751 | sb->s_time_gran = 1; |
| 752 | sb->s_bdi = nilfs->ns_bdi; | ||
| 752 | 753 | ||
| 753 | err = load_nilfs(nilfs, sbi); | 754 | err = load_nilfs(nilfs, sbi); |
| 754 | if (err) | 755 | if (err) |