summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Benjamin <matt@linuxbox.com>2013-05-23 19:18:13 -0700
committerDavid Zafman <david.zafman@inktank.com>2013-10-03 15:23:01 -0700
commit43e4bf566f1ed5dec3b63d77b12d0994f09b2155 (patch)
treed5de140589f890f6085f1c8e5b7acc71a7708ba5
parent9a3a6f3e08a4571ac7af82d964c2aa4a5136e295 (diff)
downloadceph-43e4bf566f1ed5dec3b63d77b12d0994f09b2155.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);
}