Update rt_linux.c

RtmpOSFileRead/RtmpOSFileWrite fix for Kernel >3.19
chenhaiq · Mar 26, 2016 · 8fa235d · 8fa235d
1 parent 4606187
commit 8fa235d
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/os/linux/rt_linux.c b/os/linux/rt_linux.c
@@ -1083,17 +1083,28 @@ void RtmpOSFileSeek(RTMP_OS_FD osfd, int offset)
 int RtmpOSFileRead(RTMP_OS_FD osfd, char *pDataPtr, int readLen)
 {
 	/* The object must have a read method */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
 	if (osfd->f_op && osfd->f_op->read) {
 		return osfd->f_op->read(osfd, pDataPtr, readLen, &osfd->f_pos);
 	} else {
 		DBGPRINT(RT_DEBUG_ERROR, ("no file read method\n"));
-		return -1;
+#else
+	if (osfd && osfd->f_mode & FMODE_CAN_READ) {
+	return __vfs_read(osfd, pDataPtr, readLen, &osfd->f_pos);
+	} else {
+		DBGPRINT(RT_DEBUG_ERROR, ("no file read method\n"));
+#endif
+	return -1;
 	}
 }
 
 int RtmpOSFileWrite(RTMP_OS_FD osfd, char *pDataPtr, int writeLen)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
 	return osfd->f_op->write(osfd, pDataPtr, (size_t) writeLen, &osfd->f_pos);
+#else
+	return __vfs_write(osfd, pDataPtr, (size_t) writeLen, &osfd->f_pos);
+#endif
 }
 
 static inline void __RtmpOSFSInfoChange(OS_FS_INFO * pOSFSInfo, BOOLEAN bSet)