You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

26 lines
839 B

  1. From a887fe76be459d32a638d0abde96cc715632c8d5 Mon Sep 17 00:00:00 2001
  2. From: Daniel Golle <daniel@makrotopia.org>
  3. Date: Fri, 20 May 2016 06:31:15 +0200
  4. Subject: [PATCH] device: include goto lable as well
  5. To: lvm-devel@redhat.com
  6. commit b5314c2a6ae5fe4f802e82a4f31cf2fad398ded9
  7. device: Retry open without O_NOATIME if it fails.
  8. makes use of goto lable 'opened:' but that might not be defined, e.g.
  9. on standard C libraries without O_DIRECT_SUPPORT.
  10. ---
  11. lib/device/dev-io.c | 2 +-
  12. 1 file changed, 1 insertion(+), 1 deletion(-)
  13. --- a/lib/device/dev-io.c
  14. +++ b/lib/device/dev-io.c
  15. @@ -374,7 +374,7 @@ int dev_open_flags(struct device *dev, int flags, int direct, int quiet)
  16. return 0;
  17. }
  18. -#ifdef O_DIRECT_SUPPORT
  19. +#if defined(O_DIRECT_SUPPORT) || defined(O_NOATIME)
  20. opened:
  21. if (direct)
  22. dev->flags |= DEV_O_DIRECT_TESTED;