From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 2 Mar 2018 23:25:41 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.44.0-rc2~8
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=50c1e18ab931d9da9bb8710d161dca0ad80b9f07;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next
---

50c1e18ab931d9da9bb8710d161dca0ad80b9f07
diff --cc misc/e2freefrag.c
index c5aeab9,4df6903..09fae5c
--- a/misc/e2freefrag.c
+++ b/misc/e2freefrag.c
@@@ -37,13 -30,10 +37,17 @@@ extern int optind
  #include "ext2fs/ext2fs.h"
  #include "e2freefrag.h"
  
 +#if defined(HAVE_EXT2_IOCTLS) && !defined(DEBUGFS)
 +# ifdef HAVE_LINUX_FSMAP_H
 +#  include <linux/fsmap.h>
 +# endif
 +# include "fsmap.h"
 +#endif
 +
+ #ifndef PATH_MAX
+ #define PATH_MAX 4096
+ #endif
+ 
  static void usage(const char *prog)
  {
  	fprintf(stderr, "usage: %s [-c chunksize in kb] [-h] "