Merge branch 'master' into v1.6/iekey_to_no_argu

diff --cc nvme.c
index f069622b43d961245f73aeec7bd7d44857606295,09b977d0650689c94b0a1324994e5691ad4e6b6d..499beef89c0de5d1a9bf739ef1e48c791d8f2434
--- 1/nvme.c
--- 2/nvme.c
+++ b/nvme.c
@@@ -3126,11 -3266,20 +3266,15 @@@ static int resv_release(int argc, char 
        if (fd < 0)
                return fd;
  
-       if (!cfg.namespace_id)
+       if (!cfg.namespace_id) {
                cfg.namespace_id = get_nsid(fd);
 -      if (cfg.iekey > 1) {
 -              fprintf(stderr, "invalid iekey:%d\n", cfg.iekey);
 -              err = EINVAL;
 -              goto close_fd;
 -      }
+               if (cfg.namespace_id <= 0)
+                       return EINVAL;
+       }
        if (cfg.rrela > 7) {
                fprintf(stderr, "invalid rrela:%d\n", cfg.rrela);
-               return EINVAL;
+               err = EINVAL;
+               goto close_fd;
        }
  
        err = nvme_resv_release(fd, cfg.namespace_id, cfg.rtype, cfg.rrela,