]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7451 from wjin/fix
authorKefu Chai <tchaikov@gmail.com>
Tue, 2 Feb 2016 06:56:12 +0000 (14:56 +0800)
committerKefu Chai <tchaikov@gmail.com>
Tue, 2 Feb 2016 06:56:12 +0000 (14:56 +0800)
msg/async: fix array boundary

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/msg/async/Event.cc

index 04887b874d7bdf74aa2bffed5a022155d5f3ee87,dbdf822a9f2f96507a88b9ec9fbdd38a971d13e4..865617028883faea37b89f02ab89ef1513fae92e
@@@ -179,10 -155,10 +179,10 @@@ int EventCenter::create_file_event(int 
  
  void EventCenter::delete_file_event(int fd, int mask)
  {
 -  assert(fd > 0);
 +  assert(fd >= 0);
    Mutex::Locker l(file_lock);
-   if (fd > nevent) {
-     ldout(cct, 1) << __func__ << " delete event fd=" << fd << " exceed nevent=" << nevent
+   if (fd >= nevent) {
+     ldout(cct, 1) << __func__ << " delete event fd=" << fd << " is equal or greater than nevent=" << nevent
                    << "mask=" << mask << dendl;
      return ;
    }