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/super.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/super.c')
-rw-r--r-- | fs/gfs2/super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index bc737261f234..d6488674d916 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -810,7 +810,8 @@ static void gfs2_dirty_inode(struct inode *inode, int flags) return; } need_unlock = 1; - } + } else if (WARN_ON_ONCE(ip->i_gl->gl_state != LM_ST_EXCLUSIVE)) + return; if (current->journal_info == NULL) { ret = gfs2_trans_begin(sdp, RES_DINODE, 0); |