Merge git://git.infradead.org/users/willy/linux-nvme

[firefly-linux-kernel-4.4.55.git] / drivers / md / dm-mpath.c

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 5adede17ddf6de2ffa7724aa8c72dae623f17611..b759a127f9c3718bbfffe2d16ca258fe4afe15e2 100644 (file)
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -1261,6 +1261,20 @@ static void activate_path(struct work_struct *work)
                                pg_init_done, pgpath);
 }
 
+static int noretry_error(int error)
+{
+       switch (error) {
+       case -EOPNOTSUPP:
+       case -EREMOTEIO:
+       case -EILSEQ:
+       case -ENODATA:
+               return 1;
+       }
+
+       /* Anything else could be a path failure, so should be retried */
+       return 0;
+}
+
 /*
  * end_io handling
  */
@@ -1284,7 +1298,7 @@ static int do_end_io(struct multipath *m, struct request *clone,
        if (!error && !clone->errors)
                return 0;       /* I/O complete */
 
-       if (error == -EOPNOTSUPP || error == -EREMOTEIO || error == -EILSEQ)
+       if (noretry_error(error))
                return error;
 
        if (mpio->pgpath)