git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
fs
/
nilfs2
/
segment.c
diff --git
a/fs/nilfs2/segment.c
b/fs/nilfs2/segment.c
index
141646e
..
bb24ab6
100644
(file)
--- a/
fs/nilfs2/segment.c
+++ b/
fs/nilfs2/segment.c
@@
-2573,7
+2573,7
@@
static struct nilfs_sc_info *nilfs_segctor_new(struct super_block *sb,
sci->sc_watermark = NILFS_SC_DEFAULT_WATERMARK;
if (nilfs->ns_interval)
- sci->sc_interval = nilfs->ns_interval;
+ sci->sc_interval =
HZ *
nilfs->ns_interval;
if (nilfs->ns_watermark)
sci->sc_watermark = nilfs->ns_watermark;
return sci;