diff --git a/[refs] b/[refs] index 78db425aef3e..f0391bafcdaa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1d144c71ddc11d3e9d9f29e92cf037da382a541 +refs/heads/master: 62f140c173f2c85e15527eefc6e2fb3c37a97eb1 diff --git a/trunk/fs/gfs2/locking/dlm/sysfs.c b/trunk/fs/gfs2/locking/dlm/sysfs.c index 82bef017f944..c1237a91fc68 100644 --- a/trunk/fs/gfs2/locking/dlm/sysfs.c +++ b/trunk/fs/gfs2/locking/dlm/sysfs.c @@ -42,8 +42,9 @@ static ssize_t block_store(struct gdlm_ls *ls, const char *buf, size_t len) else if (val == 0) { clear_bit(DFL_BLOCK_LOCKS, &ls->flags); gdlm_submit_delayed(ls); - } else + } else { ret = -EINVAL; + } return ret; }