client: only override umask_cb with non-NULL values

Client::init sets this, but if we later call ll_register_callbacks again
with a new set of function pointers that has umask_cb set to nullptr,
it'll override the value in the cmount.

Only reset umask_cb if the one in args is not nullptr.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 4cb17bb12feaa2b1a78a08612f8e80a191c87e5e)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index b4e4a1abbaa22a1a6d3322c5c8c692dba897d00c..04e79d719aac3271e6ffc66a1fe2d8c28620327a 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -10448,7 +10448,8 @@ void Client::ll_register_callbacks(struct ceph_client_callback_args *args)
     remount_cb = args->remount_cb;
     remount_finisher.start();
   }
-  umask_cb = args->umask_cb;
+  if (args->umask_cb)
+    umask_cb = args->umask_cb;
 }
 
 int Client::test_dentry_handling(bool can_invalidate)