diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 (GMT) |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 (GMT) |
commit | da63d20bfb12827dd7747a841ea27348af3abc0a (patch) | |
tree | ba275a74d068f91b453c08b9bacf8afe9577db9b /fs/gfs2/super.c | |
parent | 55020c8056a83ef2181e4cddd39cb2b9f4b88c5a (diff) | |
parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
download | linux-da63d20bfb12827dd7747a841ea27348af3abc0a.tar.xz |
Merge tag 'v3.7-rc5' into devicetree/next
Linux 3.7-rc5
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 bc73726..d648867 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); |