diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-13 07:48:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-13 07:48:07 +0100 |
| commit | 6214b54cbf0778804de1297444c7661e70bc4d74 (patch) | |
| tree | 262a96d1be839a30e6e8d3f3452806b7f337148c /fs/gfs2/trans.c | |
| parent | 05193639ca977cc889668718adb38db6d585045b (diff) | |
| parent | ba027da8eb309252cb611f23808da51487f68e12 (diff) | |
| download | linux-6214b54cbf0778804de1297444c7661e70bc4d74.tar.gz linux-6214b54cbf0778804de1297444c7661e70bc4d74.tar.bz2 linux-6214b54cbf0778804de1297444c7661e70bc4d74.zip | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A few small fixes plus a large but simple change for WM5102 which writes
out a bunch of register updates to the device when we enable the clock
as recommended following chip evaluation.
Diffstat (limited to 'fs/gfs2/trans.c')
| -rw-r--r-- | fs/gfs2/trans.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c index adbd27875ef9..413627072f36 100644 --- a/fs/gfs2/trans.c +++ b/fs/gfs2/trans.c @@ -155,14 +155,22 @@ void gfs2_trans_add_bh(struct gfs2_glock *gl, struct buffer_head *bh, int meta) struct gfs2_sbd *sdp = gl->gl_sbd; struct gfs2_bufdata *bd; + lock_buffer(bh); + gfs2_log_lock(sdp); bd = bh->b_private; if (bd) gfs2_assert(sdp, bd->bd_gl == gl); else { + gfs2_log_unlock(sdp); + unlock_buffer(bh); gfs2_attach_bufdata(gl, bh, meta); bd = bh->b_private; + lock_buffer(bh); + gfs2_log_lock(sdp); } lops_add(sdp, bd); + gfs2_log_unlock(sdp); + unlock_buffer(bh); } void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) |