aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-03 12:42:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-03 12:42:48 -0800
commitc640e13f8efeb38daa4c0b0891a46d32b01e51ac (patch)
treee4f5963008d2c8288b4f12cfc812be6dba8f7e5d /fs
parentcbdbb4c1d22e26f9d5314fefe6f2c7e5ed7f6a0f (diff)
parent72746ac643928f6c3113b5aa783d8ea1b13949d2 (diff)
downloadkernel_samsung_smdk4412-c640e13f8efeb38daa4c0b0891a46d32b01e51ac.zip
kernel_samsung_smdk4412-c640e13f8efeb38daa4c0b0891a46d32b01e51ac.tar.gz
kernel_samsung_smdk4412-c640e13f8efeb38daa4c0b0891a46d32b01e51ac.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix regression that i-flag is not set on changeless checkpoints
Diffstat (limited to 'fs')
-rw-r--r--fs/nilfs2/segment.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 55ebae5..2de9f63 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -430,7 +430,8 @@ static void nilfs_segctor_begin_finfo(struct nilfs_sc_info *sci,
nilfs_segctor_map_segsum_entry(
sci, &sci->sc_binfo_ptr, sizeof(struct nilfs_finfo));
- if (inode->i_sb && !test_bit(NILFS_SC_HAVE_DELTA, &sci->sc_flags))
+ if (NILFS_I(inode)->i_root &&
+ !test_bit(NILFS_SC_HAVE_DELTA, &sci->sc_flags))
set_bit(NILFS_SC_HAVE_DELTA, &sci->sc_flags);
/* skip finfo */
}