64-bit CDEV_POS

Change-Id: Iecdadf3dd92cc14525961976f51a9eb16a996d62
This commit is contained in:
Ben Gras 2014-02-24 17:30:31 +01:00 committed by Lionel Sambuc
parent 3f3e78ef59
commit 273c51a7d1
3 changed files with 3 additions and 5 deletions

View file

@ -1196,8 +1196,7 @@
#define CDEV_FLAGS m10_i4 /* transfer flags */ #define CDEV_FLAGS m10_i4 /* transfer flags */
#define CDEV_ID m10_l1 /* opaque request ID */ #define CDEV_ID m10_l1 /* opaque request ID */
#define CDEV_REQUEST m10_l2 /* I/O control request */ #define CDEV_REQUEST m10_l2 /* I/O control request */
#define CDEV_POS_LO m10_l2 /* transfer position (low bits) */ #define CDEV_POS m10_ull1 /* transfer position */
#define CDEV_POS_HI m10_l3 /* transfer position (high bits) */
/* Bits in 'CDEV_ACCESS' field of block device open requests. */ /* Bits in 'CDEV_ACCESS' field of block device open requests. */
# define CDEV_R_BIT 0x01 /* open with read access */ # define CDEV_R_BIT 0x01 /* open with read access */

View file

@ -322,7 +322,7 @@ static int do_transfer(struct chardriver *cdp, message *m_ptr, int do_write)
ssize_t r; ssize_t r;
minor = m_ptr->CDEV_MINOR; minor = m_ptr->CDEV_MINOR;
position = make64(m_ptr->CDEV_POS_LO, m_ptr->CDEV_POS_HI); position = m_ptr->CDEV_POS;
endpt = m_ptr->m_source; endpt = m_ptr->m_source;
grant = (cp_grant_id_t) m_ptr->CDEV_GRANT; grant = (cp_grant_id_t) m_ptr->CDEV_GRANT;
size = m_ptr->CDEV_COUNT; size = m_ptr->CDEV_COUNT;

View file

@ -286,8 +286,7 @@ int cdev_io(
dev_mess.CDEV_REQUEST = bytes; dev_mess.CDEV_REQUEST = bytes;
dev_mess.CDEV_USER = proc_e; dev_mess.CDEV_USER = proc_e;
} else { } else {
dev_mess.CDEV_POS_LO = ex64lo(pos); dev_mess.CDEV_POS = pos;
dev_mess.CDEV_POS_HI = ex64hi(pos);
dev_mess.CDEV_COUNT = (size_t) bytes; dev_mess.CDEV_COUNT = (size_t) bytes;
} }
dev_mess.CDEV_ID = proc_e; dev_mess.CDEV_ID = proc_e;