From: Kefu Chai <tchaikov@gmail.com>
Date: Tue, 2 Feb 2016 06:56:12 +0000 (+0800)
Subject: Merge pull request #7451 from wjin/fix
X-Git-Tag: v10.0.4~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1650324f1a3a42982d5c6dc7d60df0d9527abedd;p=ceph.git

Merge pull request #7451 from wjin/fix

msg/async: fix array boundary

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

1650324f1a3a42982d5c6dc7d60df0d9527abedd
diff --cc src/msg/async/Event.cc
index 04887b874d7b,dbdf822a9f2f..865617028883
--- a/src/msg/async/Event.cc
+++ b/src/msg/async/Event.cc
@@@ -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 ;
    }