| 12345678910111213141516171819202122232425262728293031323334353637 |
- --- xfsprogs-3.1.1.orig/libxfs/linux.c 2010-01-29 20:46:13.000000000 +0100
- +++ xfsprogs-3.1.1/libxfs/linux.c 2010-02-13 23:45:27.000000000 +0100
- @@ -20,8 +20,6 @@
- #include <xfs/libxfs.h>
- #include <mntent.h>
- #include <sys/stat.h>
- -#undef ustat
- -#include <sys/ustat.h>
- #include <sys/mount.h>
- #include <sys/ioctl.h>
- #include <sys/sysinfo.h>
- @@ -49,25 +47,6 @@ static int max_block_alignment;
- int
- platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
- {
- - /* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
- - struct ustat ust[2];
- - struct stat64 st;
- -
- - if (!s) {
- - if (stat64(block, &st) < 0)
- - return 0;
- - if ((st.st_mode & S_IFMT) != S_IFBLK)
- - return 0;
- - s = &st;
- - }
- -
- - if (ustat(s->st_rdev, ust) >= 0) {
- - if (verbose)
- - fprintf(stderr,
- - _("%s: %s contains a mounted filesystem\n"),
- - progname, name);
- - return 1;
- - }
- return 0;
- }
-
|
