diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-07 12:32:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-07 12:32:42 +1000 |
| commit | f618c1656ae4460fd4771b2c71efa48632f9287b (patch) | |
| tree | 0a824b5b37468b3ddd6cd4a06f332ec2d19b2e23 /fs/ocfs2 | |
| parent | 8b0f29058f6bfce7b950a1d7673af598983ea7fe (diff) | |
| parent | 6c7a120ac6c62316ab1fc78dfc0a7b13f3bfcbff (diff) | |
Merge remote branch 'ext4/next'
Conflicts:
fs/ext4/inode.c
fs/xfs/linux-2.6/xfs_aops.c
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/journal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 625de9d7088c..9b57c0350ff9 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -760,13 +760,13 @@ void ocfs2_set_journal_params(struct ocfs2_super *osb) if (osb->osb_commit_interval) commit_interval = osb->osb_commit_interval; - spin_lock(&journal->j_state_lock); + write_lock(&journal->j_state_lock); journal->j_commit_interval = commit_interval; if (osb->s_mount_opt & OCFS2_MOUNT_BARRIER) journal->j_flags |= JBD2_BARRIER; else journal->j_flags &= ~JBD2_BARRIER; - spin_unlock(&journal->j_state_lock); + write_unlock(&journal->j_state_lock); } int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty) |