diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
| commit | 79072f38909e3d9883317238887460c39ddcc4cb (patch) | |
| tree | 28369f5a844535ff836565eefd62695b0e890fa3 /include/linux/stat.h | |
| parent | 200d5a7684cc49ef4be40e832daf3f217e70dfbb (diff) | |
| parent | 55d8ca4f8094246da6e71889a4e04bfafaa78b10 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/stat.h')
| -rw-r--r-- | include/linux/stat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/stat.h b/include/linux/stat.h index 8ff2a122dfef..8669291352db 100644 --- a/include/linux/stat.h +++ b/include/linux/stat.h | |||
| @@ -69,7 +69,7 @@ struct kstat { | |||
| 69 | struct timespec mtime; | 69 | struct timespec mtime; |
| 70 | struct timespec ctime; | 70 | struct timespec ctime; |
| 71 | unsigned long blksize; | 71 | unsigned long blksize; |
| 72 | unsigned long blocks; | 72 | unsigned long long blocks; |
| 73 | }; | 73 | }; |
| 74 | 74 | ||
| 75 | #endif | 75 | #endif |