mirror of the now-defunct rocklinux.org
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.

35 lines
1.7 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/lvm2/linux-2.6.10-fs_h.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. diff -dur LVM2.2.00.25/lib/device/dev-io.c src.lvm2.1104330759.23110.469340415/LVM2.2.00.25/lib/device/dev-io.c
  20. --- LVM2.2.00.25/lib/device/dev-io.c 2004-09-14 22:23:23.000000000 +0000
  21. +++ src.lvm2.1104330759.23110.469340415/LVM2.2.00.25/lib/device/dev-io.c 2004-12-29 14:42:55.934962456 +0000
  22. @@ -31,7 +31,11 @@
  23. # define u64 uint64_t /* Missing without __KERNEL__ */
  24. # undef WNOHANG /* Avoid redefinition */
  25. # undef WUNTRACED /* Avoid redefinition */
  26. -# include <linux/fs.h> /* For block ioctl definitions */
  27. +/* copied from: <linux/fs.h> */ /* For block ioctl definitions */
  28. +# define BLKBSZGET _IOR(0x12,112,size_t)
  29. +# define BLKSSZGET _IO(0x12,104)/* get block device sector size */
  30. +# define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */
  31. +
  32. # define BLKSIZE_SHIFT SECTOR_SHIFT
  33. # ifndef BLKGETSIZE64 /* fs.h out-of-date */
  34. # define BLKGETSIZE64 _IOR(0x12, 114, size_t)