Pull vfs fixes from Al Viro: - fix orangefs handling of faults on write() - I'd missed that one back when orangefs was going through review. - readdir counterpart of "9p: cope with bogus responses from server in p9_client_{read,write}" - server might be lying or broken, and we'd better not overrun the kmalloc'ed buffer we are copying the results into. - NFS O_DIRECT read/write can leave iov_iter advanced by too much; that's what had been causing iov_iter_pipe() warnings davej had been seeing. - statx_timestamp.tv_nsec type fix (s32 -> u32). That one really should go in before 4.11. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: uapi: change the type of struct statx_timestamp.tv_nsec to unsigned fix nfs O_DIRECT advancing iov_iter too much p9_client_readdir() fix orangefs_bufmap_copy_from_iovec(): fix EFAULT handling
Showing the changes to include (1 of 4 files). Show all
Unified · Split
| @@ -48,17 +48,13 @@ · 47 unmodified lines | ||
| 48 | 48 | * tv_sec holds the number of seconds before (negative) or after (positive) |
| 49 | 49 | * 00:00:00 1st January 1970 UTC. |
| 50 | 50 | * |
| 51 | − * tv_nsec holds a number of nanoseconds before (0..-999,999,999 if tv_sec is | |
| 52 | − * negative) or after (0..999,999,999 if tv_sec is positive) the tv_sec time. | |
| 53 | − * | |
| 54 | − * Note that if both tv_sec and tv_nsec are non-zero, then the two values must | |
| 55 | − * either be both positive or both negative. | |
| 51 | + * tv_nsec holds a number of nanoseconds (0..999,999,999) after the tv_sec time. | |
| 56 | 52 | * |
| 57 | 53 | * __reserved is held in case we need a yet finer resolution. |
| 58 | 54 | */ |
| 59 | 55 | struct statx_timestamp { |
| 60 | 56 | __s64 tv_sec; |
| 61 | − __s32 tv_nsec; | |
| 57 | + __u32 tv_nsec; | |
| 62 | 58 | __s32 __reserved; |
| 63 | 59 | }; |
| 64 | 60 | |