From ad7ff58bf3a62c0671cd42324baf8f21ad8b699b Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Wed, 6 Oct 2010 09:58:44 +0100 Subject: [PATCH] --- yaml --- r: 211639 b: refs/heads/master c: 134669854e3a680d8aad9a4047891c653715f4c0 h: refs/heads/master i: 211637: 091ab0e984508aab5d918f868cb56b050c7adf05 211635: f2e26a2182284930339676d85336f770aea37f70 211631: a01ca05ff68f636d9d9070c05097451eefab41aa v: v3 --- [refs] | 2 +- trunk/fs/gfs2/glops.c | 1 - trunk/fs/gfs2/sys.c | 5 ++++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6f865d1f303b..2c5ba3e02f05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46290341cd649c2bfb69e5067c1804c0395c83a1 +refs/heads/master: 134669854e3a680d8aad9a4047891c653715f4c0 diff --git a/trunk/fs/gfs2/glops.c b/trunk/fs/gfs2/glops.c index 621d80e8fb2a..0d149dcc04e5 100644 --- a/trunk/fs/gfs2/glops.c +++ b/trunk/fs/gfs2/glops.c @@ -452,7 +452,6 @@ const struct gfs2_glock_operations *gfs2_glops_list[] = { [LM_TYPE_META] = &gfs2_meta_glops, [LM_TYPE_INODE] = &gfs2_inode_glops, [LM_TYPE_RGRP] = &gfs2_rgrp_glops, - [LM_TYPE_NONDISK] = &gfs2_trans_glops, [LM_TYPE_IOPEN] = &gfs2_iopen_glops, [LM_TYPE_FLOCK] = &gfs2_flock_glops, [LM_TYPE_NONDISK] = &gfs2_nondisk_glops, diff --git a/trunk/fs/gfs2/sys.c b/trunk/fs/gfs2/sys.c index 64082a5feae1..748ccb557c18 100644 --- a/trunk/fs/gfs2/sys.c +++ b/trunk/fs/gfs2/sys.c @@ -230,7 +230,10 @@ static ssize_t demote_rq_store(struct gfs2_sbd *sdp, const char *buf, size_t len if (gltype > LM_TYPE_JOURNAL) return -EINVAL; - glops = gfs2_glops_list[gltype]; + if (gltype == LM_TYPE_NONDISK && glnum == GFS2_TRANS_LOCK) + glops = &gfs2_trans_glops; + else + glops = gfs2_glops_list[gltype]; if (glops == NULL) return -EINVAL; if (!test_and_set_bit(SDF_DEMOTE, &sdp->sd_flags))