diff options
| author | Matt Wilson <msw@redhat.com> | 2000-02-14 22:22:42 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-02-14 22:22:42 +0000 |
| commit | 7cd2ac68ee391e7d5ec61e3330a3b0a3653776a4 (patch) | |
| tree | 80921aec6440607df3a865843a445b7832127a8c /isys/isys.c | |
| parent | 900db43e78c3437a2261d9e88f75448daaca8a80 (diff) | |
| download | anaconda-7cd2ac68ee391e7d5ec61e3330a3b0a3653776a4.tar.gz anaconda-7cd2ac68ee391e7d5ec61e3330a3b0a3653776a4.tar.xz anaconda-7cd2ac68ee391e7d5ec61e3330a3b0a3653776a4.zip | |
1) got rid of redefinition of dev_t
2) added some typecasts for raid superblock calculation
Diffstat (limited to 'isys/isys.c')
| -rw-r--r-- | isys/isys.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/isys/isys.c b/isys/isys.c index 389ebc90c..4211e6686 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -1,14 +1,8 @@ #include <errno.h> #include <fcntl.h> #include <popt.h> -/* Need to tell loop.h what the actual dev_t type is. */ -#if defined(__alpha) || (defined(__sparc__) && defined(__arch64__)) -#define dev_t unsigned int -#else -#define dev_t unsigned short -#endif +#include <sys/types.h> #include <linux/loop.h> -#undef dev_t #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/stat.h> @@ -953,7 +947,7 @@ static PyObject * doGetRaidSuperblock(PyObject * s, PyObject * args) { /* put the size in 1k blocks */ size >>= 1; - if (llseek(fd, 1024 * MD_NEW_SIZE_BLOCKS(size), SEEK_SET) < 0) { + if (llseek(fd, ((long long) 1024) * MD_NEW_SIZE_BLOCKS(size), SEEK_SET) < 0) { PyErr_SetFromErrno(PyExc_SystemError); return NULL; } |