From 91575c2bebbcc7e19ba9934dccc44a9558a19f79 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Wed, 26 Jan 2005 15:51:24 +0000 Subject: [PATCH] Stefan Fiedler: lvm2: patch for linux-2.6.10 including linux/fs.h in lib/device/dev-io.c causes errors, copy the three needed lines instead Index: package/base/lvm2/linux-2.6.10-fs_h.patch =================================================================== [2004123000203417666] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5486 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/lvm2/linux-2.6.10-fs_h.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 package/base/lvm2/linux-2.6.10-fs_h.patch diff --git a/package/base/lvm2/linux-2.6.10-fs_h.patch b/package/base/lvm2/linux-2.6.10-fs_h.patch new file mode 100644 index 000000000..1d7c1bc29 --- /dev/null +++ b/package/base/lvm2/linux-2.6.10-fs_h.patch @@ -0,0 +1,16 @@ +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 +--- LVM2.2.00.25/lib/device/dev-io.c 2004-09-14 22:23:23.000000000 +0000 ++++ src.lvm2.1104330759.23110.469340415/LVM2.2.00.25/lib/device/dev-io.c 2004-12-29 14:42:55.934962456 +0000 +@@ -31,7 +31,11 @@ + # define u64 uint64_t /* Missing without __KERNEL__ */ + # undef WNOHANG /* Avoid redefinition */ + # undef WUNTRACED /* Avoid redefinition */ +-# include /* For block ioctl definitions */ ++/* copied from: */ /* For block ioctl definitions */ ++# define BLKBSZGET _IOR(0x12,112,size_t) ++# define BLKSSZGET _IO(0x12,104)/* get block device sector size */ ++# define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ ++ + # define BLKSIZE_SHIFT SECTOR_SHIFT + # ifndef BLKGETSIZE64 /* fs.h out-of-date */ + # define BLKGETSIZE64 _IOR(0x12, 114, size_t)