diff options
Diffstat (limited to 'fs/ecryptfs/read_write.c')
-rw-r--r-- | fs/ecryptfs/read_write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c index 3745f7c2b9c2..ec3d9368dc5b 100644 --- a/fs/ecryptfs/read_write.c +++ b/fs/ecryptfs/read_write.c | |||
@@ -130,13 +130,13 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset, | |||
130 | pgoff_t ecryptfs_page_idx = (pos >> PAGE_CACHE_SHIFT); | 130 | pgoff_t ecryptfs_page_idx = (pos >> PAGE_CACHE_SHIFT); |
131 | size_t start_offset_in_page = (pos & ~PAGE_CACHE_MASK); | 131 | size_t start_offset_in_page = (pos & ~PAGE_CACHE_MASK); |
132 | size_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page); | 132 | size_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page); |
133 | size_t total_remaining_bytes = ((offset + size) - pos); | 133 | loff_t total_remaining_bytes = ((offset + size) - pos); |
134 | 134 | ||
135 | if (num_bytes > total_remaining_bytes) | 135 | if (num_bytes > total_remaining_bytes) |
136 | num_bytes = total_remaining_bytes; | 136 | num_bytes = total_remaining_bytes; |
137 | if (pos < offset) { | 137 | if (pos < offset) { |
138 | /* remaining zeros to write, up to destination offset */ | 138 | /* remaining zeros to write, up to destination offset */ |
139 | size_t total_remaining_zeros = (offset - pos); | 139 | loff_t total_remaining_zeros = (offset - pos); |
140 | 140 | ||
141 | if (num_bytes > total_remaining_zeros) | 141 | if (num_bytes > total_remaining_zeros) |
142 | num_bytes = total_remaining_zeros; | 142 | num_bytes = total_remaining_zeros; |