X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flclient%2Flcommon_misc.c;h=ee4fef34a6e48c44cb22e8b588b0e61f5b4d6da7;hp=24e896d84e8e130fcdbaa378ba1624f7bbcfe7a7;hb=7877f9ebf7cde785319f92e4a1fd033def11f23a;hpb=556256c2f86c0b7b10512ebd1f72fedc36195769 diff --git a/lustre/lclient/lcommon_misc.c b/lustre/lclient/lcommon_misc.c index 24e896d..ee4fef3 100644 --- a/lustre/lclient/lcommon_misc.c +++ b/lustre/lclient/lcommon_misc.c @@ -154,8 +154,9 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock, descr->cld_mode = CLM_GROUP; enqflags = CEF_MUST | (nonblock ? CEF_NONBLOCK : 0); - lock = cl_lock_request(env, io, descr, enqflags, - GROUPLOCK_SCOPE, cfs_current()); + descr->cld_enq_flags = enqflags; + + lock = cl_lock_request(env, io, descr, GROUPLOCK_SCOPE, cfs_current()); if (IS_ERR(lock)) { cl_io_fini(env, io); cl_env_put(env, &refcheck);