d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make linux(4) support the BLKPBSZGET ioctl. Oracle uses it.

Browse Source 
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D25694
This commit is contained in:
Edward Tomasz Napierala 2020-07-19 12:25:03 +00:00
parent 55ec696d42
commit aa75412146
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/compat/linux/linux_ioctl.c
View File

@ -285,9 +285,9 @@ linux_ioctl_disk(struct thread *td, struct linux_ioctl_args *args)
{ {
struct file *fp; struct file *fp;
int error; int error;
u_int sectorsize; u_int sectorsize, psectorsize;
uint64_t blksize64; uint64_t blksize64;
off_t mediasize; off_t mediasize, stripesize;
error = fget(td, args->fd, &cap_ioctl_rights, &fp); error = fget(td, args->fd, &cap_ioctl_rights, &fp);
if (error != 0) if (error != 0)
@ -327,6 +327,27 @@ linux_ioctl_disk(struct thread *td, struct linux_ioctl_args *args)
return (copyout(&sectorsize, (void *)args->arg, return (copyout(&sectorsize, (void *)args->arg,
sizeof(sectorsize))); sizeof(sectorsize)));
break; break;
case LINUX_BLKPBSZGET:
error = fo_ioctl(fp, DIOCGSTRIPESIZE,
(caddr_t)&stripesize, td->td_ucred, td);
if (error != 0) {
fdrop(fp, td);
return (error);
}
if (stripesize > 0 && stripesize <= 4096) {
psectorsize = stripesize;
} else {
error = fo_ioctl(fp, DIOCGSECTORSIZE,
(caddr_t)&sectorsize, td->td_ucred, td);
if (error != 0) {
fdrop(fp, td);
return (error);
}
psectorsize = sectorsize;
}
fdrop(fp, td);
return (copyout(&psectorsize, (void *)args->arg,
sizeof(psectorsize)));
} }
fdrop(fp, td); fdrop(fp, td);
return (ENOIOCTL); return (ENOIOCTL);

3
sys/compat/linux/linux_ioctl.h
View File

@ -58,9 +58,10 @@
#define LINUX_BLKSECTGET 0x1267 #define LINUX_BLKSECTGET 0x1267
#define LINUX_BLKSSZGET 0x1268 #define LINUX_BLKSSZGET 0x1268
#define LINUX_BLKGETSIZE64 0x1272 #define LINUX_BLKGETSIZE64 0x1272
#define LINUX_BLKPBSZGET 0x127b
#define LINUX_IOCTL_DISK_MIN LINUX_BLKROSET #define LINUX_IOCTL_DISK_MIN LINUX_BLKROSET
#define LINUX_IOCTL_DISK_MAX LINUX_BLKGETSIZE64 #define LINUX_IOCTL_DISK_MAX LINUX_BLKPBSZGET
/* /*
* hdio * hdio