1
0

patch-libxfs_linux_c 964 B

1234567891011121314151617181920212223242526272829303132333435363738
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  2. --- xfsprogs-3.0.0.orig/libxfs/linux.c 2009-02-04 23:29:25.000000000 +0100
  3. +++ xfsprogs-3.0.0/libxfs/linux.c 2009-03-27 11:43:17.000000000 +0100
  4. @@ -20,8 +20,6 @@
  5. #include <xfs/libxfs.h>
  6. #include <mntent.h>
  7. #include <sys/stat.h>
  8. -#undef ustat
  9. -#include <sys/ustat.h>
  10. #include <sys/mount.h>
  11. #include <sys/ioctl.h>
  12. #include <sys/sysinfo.h>
  13. @@ -49,25 +47,6 @@ static int max_block_alignment;
  14. int
  15. platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
  16. {
  17. - /* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
  18. - struct ustat ust[2];
  19. - struct stat64 st;
  20. -
  21. - if (!s) {
  22. - if (stat64(block, &st) < 0)
  23. - return 0;
  24. - if ((st.st_mode & S_IFMT) != S_IFBLK)
  25. - return 0;
  26. - s = &st;
  27. - }
  28. -
  29. - if (ustat(s->st_rdev, ust) >= 0) {
  30. - if (verbose)
  31. - fprintf(stderr,
  32. - _("%s: %s contains a mounted filesystem\n"),
  33. - progname, name);
  34. - return 1;
  35. - }
  36. return 0;
  37. }