summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Benjamin <matt@linuxbox.com>2013-05-23 19:18:13 -0700
committerSage Weil <sage@inktank.com>2013-09-04 17:49:36 -0700
commit83b6c77dbb5149b92c8c6ee2e2a508ada6c17be0 (patch)
treefa7010ad1cbb17cd4e4d5231c519cbcb43840e31
parent298117a9bf06b3d4263e1267b6be547f1dc847c4 (diff)
downloadceph-83b6c77dbb5149b92c8c6ee2e2a508ada6c17be0.tar.gz
client/Client: make open fhp argument optional
This is more natural for both FUSE and Ganesha. Signed-off-by: Matt Benjamin <matt@linuxbox.com>
-rw-r--r--src/client/Client.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/Client.cc b/src/client/Client.cc
index c7f21914911..cbc771ae595 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -5555,7 +5555,8 @@ int Client::_open(Inode *in, int flags, mode_t mode, Fh **fhp, int uid, int gid)
// success?
if (result >= 0) {
- *fhp = _create_fh(in, flags, cmode);
+ if (fhp)
+ *fhp = _create_fh(in, flags, cmode);
} else {
in->put_open_ref(cmode);
}