diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/dcache.c | 4 | ||||
-rw-r--r-- | fs/fs_struct.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index a9dd384c5e80..0a38ef8d7f00 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
@@ -2606,7 +2606,7 @@ static void __d_move(struct dentry * dentry, struct dentry * target) | |||
2606 | dentry_lock_for_move(dentry, target); | 2606 | dentry_lock_for_move(dentry, target); |
2607 | 2607 | ||
2608 | write_seqcount_begin(&dentry->d_seq); | 2608 | write_seqcount_begin(&dentry->d_seq); |
2609 | write_seqcount_begin(&target->d_seq); | 2609 | write_seqcount_begin_nested(&target->d_seq, DENTRY_D_LOCK_NESTED); |
2610 | 2610 | ||
2611 | /* __d_drop does write_seqcount_barrier, but they're OK to nest. */ | 2611 | /* __d_drop does write_seqcount_barrier, but they're OK to nest. */ |
2612 | 2612 | ||
@@ -2738,7 +2738,7 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon) | |||
2738 | dentry_lock_for_move(anon, dentry); | 2738 | dentry_lock_for_move(anon, dentry); |
2739 | 2739 | ||
2740 | write_seqcount_begin(&dentry->d_seq); | 2740 | write_seqcount_begin(&dentry->d_seq); |
2741 | write_seqcount_begin(&anon->d_seq); | 2741 | write_seqcount_begin_nested(&anon->d_seq, DENTRY_D_LOCK_NESTED); |
2742 | 2742 | ||
2743 | dparent = dentry->d_parent; | 2743 | dparent = dentry->d_parent; |
2744 | 2744 | ||
diff --git a/fs/fs_struct.c b/fs/fs_struct.c index d8ac61d0c932..7dca743b2ce1 100644 --- a/fs/fs_struct.c +++ b/fs/fs_struct.c | |||
@@ -161,6 +161,6 @@ EXPORT_SYMBOL(current_umask); | |||
161 | struct fs_struct init_fs = { | 161 | struct fs_struct init_fs = { |
162 | .users = 1, | 162 | .users = 1, |
163 | .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock), | 163 | .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock), |
164 | .seq = SEQCNT_ZERO, | 164 | .seq = SEQCNT_ZERO(init_fs.seq), |
165 | .umask = 0022, | 165 | .umask = 0022, |
166 | }; | 166 | }; |