diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_file.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_file.c | 854 |
1 files changed, 805 insertions, 49 deletions
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index e4caeb28ce2e..42dd3bcfba6b 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 16 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 17 | */ | 17 | */ |
| 18 | #include "xfs.h" | 18 | #include "xfs.h" |
| 19 | #include "xfs_fs.h" | ||
| 19 | #include "xfs_bit.h" | 20 | #include "xfs_bit.h" |
| 20 | #include "xfs_log.h" | 21 | #include "xfs_log.h" |
| 21 | #include "xfs_inum.h" | 22 | #include "xfs_inum.h" |
| @@ -34,52 +35,279 @@ | |||
| 34 | #include "xfs_dir2_sf.h" | 35 | #include "xfs_dir2_sf.h" |
| 35 | #include "xfs_dinode.h" | 36 | #include "xfs_dinode.h" |
| 36 | #include "xfs_inode.h" | 37 | #include "xfs_inode.h" |
| 38 | #include "xfs_inode_item.h" | ||
| 39 | #include "xfs_bmap.h" | ||
| 37 | #include "xfs_error.h" | 40 | #include "xfs_error.h" |
| 38 | #include "xfs_rw.h" | 41 | #include "xfs_rw.h" |
| 39 | #include "xfs_vnodeops.h" | 42 | #include "xfs_vnodeops.h" |
| 40 | #include "xfs_da_btree.h" | 43 | #include "xfs_da_btree.h" |
| 41 | #include "xfs_ioctl.h" | 44 | #include "xfs_ioctl.h" |
| 45 | #include "xfs_trace.h" | ||
| 42 | 46 | ||
| 43 | #include <linux/dcache.h> | 47 | #include <linux/dcache.h> |
| 44 | 48 | ||
| 45 | static const struct vm_operations_struct xfs_file_vm_ops; | 49 | static const struct vm_operations_struct xfs_file_vm_ops; |
| 46 | 50 | ||
| 47 | STATIC ssize_t | 51 | /* |
| 48 | xfs_file_aio_read( | 52 | * xfs_iozero |
| 49 | struct kiocb *iocb, | 53 | * |
| 50 | const struct iovec *iov, | 54 | * xfs_iozero clears the specified range of buffer supplied, |
| 51 | unsigned long nr_segs, | 55 | * and marks all the affected blocks as valid and modified. If |
| 52 | loff_t pos) | 56 | * an affected block is not allocated, it will be allocated. If |
| 57 | * an affected block is not completely overwritten, and is not | ||
| 58 | * valid before the operation, it will be read from disk before | ||
| 59 | * being partially zeroed. | ||
| 60 | */ | ||
| 61 | STATIC int | ||
| 62 | xfs_iozero( | ||
| 63 | struct xfs_inode *ip, /* inode */ | ||
| 64 | loff_t pos, /* offset in file */ | ||
| 65 | size_t count) /* size of data to zero */ | ||
| 53 | { | 66 | { |
| 54 | struct file *file = iocb->ki_filp; | 67 | struct page *page; |
| 55 | int ioflags = 0; | 68 | struct address_space *mapping; |
| 69 | int status; | ||
| 56 | 70 | ||
| 57 | BUG_ON(iocb->ki_pos != pos); | 71 | mapping = VFS_I(ip)->i_mapping; |
| 58 | if (unlikely(file->f_flags & O_DIRECT)) | 72 | do { |
| 59 | ioflags |= IO_ISDIRECT; | 73 | unsigned offset, bytes; |
| 60 | if (file->f_mode & FMODE_NOCMTIME) | 74 | void *fsdata; |
| 61 | ioflags |= IO_INVIS; | 75 | |
| 62 | return xfs_read(XFS_I(file->f_path.dentry->d_inode), iocb, iov, | 76 | offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */ |
| 63 | nr_segs, &iocb->ki_pos, ioflags); | 77 | bytes = PAGE_CACHE_SIZE - offset; |
| 78 | if (bytes > count) | ||
| 79 | bytes = count; | ||
| 80 | |||
| 81 | status = pagecache_write_begin(NULL, mapping, pos, bytes, | ||
| 82 | AOP_FLAG_UNINTERRUPTIBLE, | ||
| 83 | &page, &fsdata); | ||
| 84 | if (status) | ||
| 85 | break; | ||
| 86 | |||
| 87 | zero_user(page, offset, bytes); | ||
| 88 | |||
| 89 | status = pagecache_write_end(NULL, mapping, pos, bytes, bytes, | ||
| 90 | page, fsdata); | ||
| 91 | WARN_ON(status <= 0); /* can't return less than zero! */ | ||
| 92 | pos += bytes; | ||
| 93 | count -= bytes; | ||
| 94 | status = 0; | ||
| 95 | } while (count); | ||
| 96 | |||
| 97 | return (-status); | ||
| 98 | } | ||
| 99 | |||
| 100 | STATIC int | ||
| 101 | xfs_file_fsync( | ||
| 102 | struct file *file, | ||
| 103 | struct dentry *dentry, | ||
| 104 | int datasync) | ||
| 105 | { | ||
| 106 | struct xfs_inode *ip = XFS_I(dentry->d_inode); | ||
| 107 | struct xfs_trans *tp; | ||
| 108 | int error = 0; | ||
| 109 | int log_flushed = 0; | ||
| 110 | |||
| 111 | xfs_itrace_entry(ip); | ||
| 112 | |||
| 113 | if (XFS_FORCED_SHUTDOWN(ip->i_mount)) | ||
| 114 | return -XFS_ERROR(EIO); | ||
| 115 | |||
| 116 | xfs_iflags_clear(ip, XFS_ITRUNCATED); | ||
| 117 | |||
| 118 | /* | ||
| 119 | * We always need to make sure that the required inode state is safe on | ||
| 120 | * disk. The inode might be clean but we still might need to force the | ||
| 121 | * log because of committed transactions that haven't hit the disk yet. | ||
| 122 | * Likewise, there could be unflushed non-transactional changes to the | ||
| 123 | * inode core that have to go to disk and this requires us to issue | ||
| 124 | * a synchronous transaction to capture these changes correctly. | ||
| 125 | * | ||
| 126 | * This code relies on the assumption that if the i_update_core field | ||
| 127 | * of the inode is clear and the inode is unpinned then it is clean | ||
| 128 | * and no action is required. | ||
| 129 | */ | ||
| 130 | xfs_ilock(ip, XFS_ILOCK_SHARED); | ||
| 131 | |||
| 132 | /* | ||
| 133 | * First check if the VFS inode is marked dirty. All the dirtying | ||
| 134 | * of non-transactional updates no goes through mark_inode_dirty*, | ||
| 135 | * which allows us to distinguish beteeen pure timestamp updates | ||
| 136 | * and i_size updates which need to be caught for fdatasync. | ||
| 137 | * After that also theck for the dirty state in the XFS inode, which | ||
| 138 | * might gets cleared when the inode gets written out via the AIL | ||
| 139 | * or xfs_iflush_cluster. | ||
| 140 | */ | ||
| 141 | if (((dentry->d_inode->i_state & I_DIRTY_DATASYNC) || | ||
| 142 | ((dentry->d_inode->i_state & I_DIRTY_SYNC) && !datasync)) && | ||
| 143 | ip->i_update_core) { | ||
| 144 | /* | ||
| 145 | * Kick off a transaction to log the inode core to get the | ||
| 146 | * updates. The sync transaction will also force the log. | ||
| 147 | */ | ||
| 148 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | ||
| 149 | tp = xfs_trans_alloc(ip->i_mount, XFS_TRANS_FSYNC_TS); | ||
| 150 | error = xfs_trans_reserve(tp, 0, | ||
| 151 | XFS_FSYNC_TS_LOG_RES(ip->i_mount), 0, 0, 0); | ||
| 152 | if (error) { | ||
| 153 | xfs_trans_cancel(tp, 0); | ||
| 154 | return -error; | ||
| 155 | } | ||
| 156 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 157 | |||
| 158 | /* | ||
| 159 | * Note - it's possible that we might have pushed ourselves out | ||
| 160 | * of the way during trans_reserve which would flush the inode. | ||
| 161 | * But there's no guarantee that the inode buffer has actually | ||
| 162 | * gone out yet (it's delwri). Plus the buffer could be pinned | ||
| 163 | * anyway if it's part of an inode in another recent | ||
| 164 | * transaction. So we play it safe and fire off the | ||
| 165 | * transaction anyway. | ||
| 166 | */ | ||
| 167 | xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); | ||
| 168 | xfs_trans_ihold(tp, ip); | ||
| 169 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); | ||
| 170 | xfs_trans_set_sync(tp); | ||
| 171 | error = _xfs_trans_commit(tp, 0, &log_flushed); | ||
| 172 | |||
| 173 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 174 | } else { | ||
| 175 | /* | ||
| 176 | * Timestamps/size haven't changed since last inode flush or | ||
| 177 | * inode transaction commit. That means either nothing got | ||
| 178 | * written or a transaction committed which caught the updates. | ||
| 179 | * If the latter happened and the transaction hasn't hit the | ||
| 180 | * disk yet, the inode will be still be pinned. If it is, | ||
| 181 | * force the log. | ||
| 182 | */ | ||
| 183 | if (xfs_ipincount(ip)) { | ||
| 184 | error = _xfs_log_force_lsn(ip->i_mount, | ||
| 185 | ip->i_itemp->ili_last_lsn, | ||
| 186 | XFS_LOG_SYNC, &log_flushed); | ||
| 187 | } | ||
| 188 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | ||
| 189 | } | ||
| 190 | |||
| 191 | if (ip->i_mount->m_flags & XFS_MOUNT_BARRIER) { | ||
| 192 | /* | ||
| 193 | * If the log write didn't issue an ordered tag we need | ||
| 194 | * to flush the disk cache for the data device now. | ||
| 195 | */ | ||
| 196 | if (!log_flushed) | ||
| 197 | xfs_blkdev_issue_flush(ip->i_mount->m_ddev_targp); | ||
| 198 | |||
| 199 | /* | ||
| 200 | * If this inode is on the RT dev we need to flush that | ||
| 201 | * cache as well. | ||
| 202 | */ | ||
| 203 | if (XFS_IS_REALTIME_INODE(ip)) | ||
| 204 | xfs_blkdev_issue_flush(ip->i_mount->m_rtdev_targp); | ||
| 205 | } | ||
| 206 | |||
| 207 | return -error; | ||
| 64 | } | 208 | } |
| 65 | 209 | ||
| 66 | STATIC ssize_t | 210 | STATIC ssize_t |
| 67 | xfs_file_aio_write( | 211 | xfs_file_aio_read( |
| 68 | struct kiocb *iocb, | 212 | struct kiocb *iocb, |
| 69 | const struct iovec *iov, | 213 | const struct iovec *iovp, |
| 70 | unsigned long nr_segs, | 214 | unsigned long nr_segs, |
| 71 | loff_t pos) | 215 | loff_t pos) |
| 72 | { | 216 | { |
| 73 | struct file *file = iocb->ki_filp; | 217 | struct file *file = iocb->ki_filp; |
| 218 | struct inode *inode = file->f_mapping->host; | ||
| 219 | struct xfs_inode *ip = XFS_I(inode); | ||
| 220 | struct xfs_mount *mp = ip->i_mount; | ||
| 221 | size_t size = 0; | ||
| 222 | ssize_t ret = 0; | ||
| 74 | int ioflags = 0; | 223 | int ioflags = 0; |
| 224 | xfs_fsize_t n; | ||
| 225 | unsigned long seg; | ||
| 226 | |||
| 227 | XFS_STATS_INC(xs_read_calls); | ||
| 75 | 228 | ||
| 76 | BUG_ON(iocb->ki_pos != pos); | 229 | BUG_ON(iocb->ki_pos != pos); |
| 230 | |||
| 77 | if (unlikely(file->f_flags & O_DIRECT)) | 231 | if (unlikely(file->f_flags & O_DIRECT)) |
| 78 | ioflags |= IO_ISDIRECT; | 232 | ioflags |= IO_ISDIRECT; |
| 79 | if (file->f_mode & FMODE_NOCMTIME) | 233 | if (file->f_mode & FMODE_NOCMTIME) |
| 80 | ioflags |= IO_INVIS; | 234 | ioflags |= IO_INVIS; |
| 81 | return xfs_write(XFS_I(file->f_mapping->host), iocb, iov, nr_segs, | 235 | |
| 82 | &iocb->ki_pos, ioflags); | 236 | /* START copy & waste from filemap.c */ |
| 237 | for (seg = 0; seg < nr_segs; seg++) { | ||
| 238 | const struct iovec *iv = &iovp[seg]; | ||
| 239 | |||
| 240 | /* | ||
| 241 | * If any segment has a negative length, or the cumulative | ||
| 242 | * length ever wraps negative then return -EINVAL. | ||
| 243 | */ | ||
| 244 | size += iv->iov_len; | ||
| 245 | if (unlikely((ssize_t)(size|iv->iov_len) < 0)) | ||
| 246 | return XFS_ERROR(-EINVAL); | ||
| 247 | } | ||
| 248 | /* END copy & waste from filemap.c */ | ||
| 249 | |||
| 250 | if (unlikely(ioflags & IO_ISDIRECT)) { | ||
| 251 | xfs_buftarg_t *target = | ||
| 252 | XFS_IS_REALTIME_INODE(ip) ? | ||
| 253 | mp->m_rtdev_targp : mp->m_ddev_targp; | ||
| 254 | if ((iocb->ki_pos & target->bt_smask) || | ||
| 255 | (size & target->bt_smask)) { | ||
| 256 | if (iocb->ki_pos == ip->i_size) | ||
| 257 | return 0; | ||
| 258 | return -XFS_ERROR(EINVAL); | ||
| 259 | } | ||
| 260 | } | ||
| 261 | |||
| 262 | n = XFS_MAXIOFFSET(mp) - iocb->ki_pos; | ||
| 263 | if (n <= 0 || size == 0) | ||
| 264 | return 0; | ||
| 265 | |||
| 266 | if (n < size) | ||
| 267 | size = n; | ||
| 268 | |||
| 269 | if (XFS_FORCED_SHUTDOWN(mp)) | ||
| 270 | return -EIO; | ||
| 271 | |||
| 272 | if (unlikely(ioflags & IO_ISDIRECT)) | ||
| 273 | mutex_lock(&inode->i_mutex); | ||
| 274 | xfs_ilock(ip, XFS_IOLOCK_SHARED); | ||
| 275 | |||
| 276 | if (DM_EVENT_ENABLED(ip, DM_EVENT_READ) && !(ioflags & IO_INVIS)) { | ||
| 277 | int dmflags = FILP_DELAY_FLAG(file) | DM_SEM_FLAG_RD(ioflags); | ||
| 278 | int iolock = XFS_IOLOCK_SHARED; | ||
| 279 | |||
| 280 | ret = -XFS_SEND_DATA(mp, DM_EVENT_READ, ip, iocb->ki_pos, size, | ||
| 281 | dmflags, &iolock); | ||
| 282 | if (ret) { | ||
| 283 | xfs_iunlock(ip, XFS_IOLOCK_SHARED); | ||
| 284 | if (unlikely(ioflags & IO_ISDIRECT)) | ||
| 285 | mutex_unlock(&inode->i_mutex); | ||
| 286 | return ret; | ||
| 287 | } | ||
| 288 | } | ||
| 289 | |||
| 290 | if (unlikely(ioflags & IO_ISDIRECT)) { | ||
| 291 | if (inode->i_mapping->nrpages) { | ||
| 292 | ret = -xfs_flushinval_pages(ip, | ||
| 293 | (iocb->ki_pos & PAGE_CACHE_MASK), | ||
| 294 | -1, FI_REMAPF_LOCKED); | ||
| 295 | } | ||
| 296 | mutex_unlock(&inode->i_mutex); | ||
| 297 | if (ret) { | ||
| 298 | xfs_iunlock(ip, XFS_IOLOCK_SHARED); | ||
| 299 | return ret; | ||
| 300 | } | ||
| 301 | } | ||
| 302 | |||
| 303 | trace_xfs_file_read(ip, size, iocb->ki_pos, ioflags); | ||
| 304 | |||
| 305 | ret = generic_file_aio_read(iocb, iovp, nr_segs, iocb->ki_pos); | ||
| 306 | if (ret > 0) | ||
| 307 | XFS_STATS_ADD(xs_read_bytes, ret); | ||
| 308 | |||
| 309 | xfs_iunlock(ip, XFS_IOLOCK_SHARED); | ||
| 310 | return ret; | ||
| 83 | } | 311 | } |
| 84 | 312 | ||
| 85 | STATIC ssize_t | 313 | STATIC ssize_t |
| @@ -87,16 +315,44 @@ xfs_file_splice_read( | |||
| 87 | struct file *infilp, | 315 | struct file *infilp, |
| 88 | loff_t *ppos, | 316 | loff_t *ppos, |
| 89 | struct pipe_inode_info *pipe, | 317 | struct pipe_inode_info *pipe, |
| 90 | size_t len, | 318 | size_t count, |
| 91 | unsigned int flags) | 319 | unsigned int flags) |
| 92 | { | 320 | { |
| 321 | struct xfs_inode *ip = XFS_I(infilp->f_mapping->host); | ||
| 322 | struct xfs_mount *mp = ip->i_mount; | ||
| 93 | int ioflags = 0; | 323 | int ioflags = 0; |
| 324 | ssize_t ret; | ||
| 325 | |||
| 326 | XFS_STATS_INC(xs_read_calls); | ||
| 94 | 327 | ||
| 95 | if (infilp->f_mode & FMODE_NOCMTIME) | 328 | if (infilp->f_mode & FMODE_NOCMTIME) |
| 96 | ioflags |= IO_INVIS; | 329 | ioflags |= IO_INVIS; |
| 97 | 330 | ||
| 98 | return xfs_splice_read(XFS_I(infilp->f_path.dentry->d_inode), | 331 | if (XFS_FORCED_SHUTDOWN(ip->i_mount)) |
| 99 | infilp, ppos, pipe, len, flags, ioflags); | 332 | return -EIO; |
| 333 | |||
| 334 | xfs_ilock(ip, XFS_IOLOCK_SHARED); | ||
| 335 | |||
| 336 | if (DM_EVENT_ENABLED(ip, DM_EVENT_READ) && !(ioflags & IO_INVIS)) { | ||
| 337 | int iolock = XFS_IOLOCK_SHARED; | ||
| 338 | int error; | ||
| 339 | |||
| 340 | error = XFS_SEND_DATA(mp, DM_EVENT_READ, ip, *ppos, count, | ||
| 341 | FILP_DELAY_FLAG(infilp), &iolock); | ||
| 342 | if (error) { | ||
| 343 | xfs_iunlock(ip, XFS_IOLOCK_SHARED); | ||
| 344 | return -error; | ||
| 345 | } | ||
| 346 | } | ||
| 347 | |||
| 348 | trace_xfs_file_splice_read(ip, count, *ppos, ioflags); | ||
| 349 | |||
| 350 | ret = generic_file_splice_read(infilp, ppos, pipe, count, flags); | ||
| 351 | if (ret > 0) | ||
| 352 | XFS_STATS_ADD(xs_read_bytes, ret); | ||
| 353 | |||
| 354 | xfs_iunlock(ip, XFS_IOLOCK_SHARED); | ||
| 355 | return ret; | ||
| 100 | } | 356 | } |
| 101 | 357 | ||
| 102 | STATIC ssize_t | 358 | STATIC ssize_t |
| @@ -104,16 +360,538 @@ xfs_file_splice_write( | |||
| 104 | struct pipe_inode_info *pipe, | 360 | struct pipe_inode_info *pipe, |
| 105 | struct file *outfilp, | 361 | struct file *outfilp, |
| 106 | loff_t *ppos, | 362 | loff_t *ppos, |
| 107 | size_t len, | 363 | size_t count, |
| 108 | unsigned int flags) | 364 | unsigned int flags) |
| 109 | { | 365 | { |
| 366 | struct inode *inode = outfilp->f_mapping->host; | ||
| 367 | struct xfs_inode *ip = XFS_I(inode); | ||
| 368 | struct xfs_mount *mp = ip->i_mount; | ||
| 369 | xfs_fsize_t isize, new_size; | ||
| 110 | int ioflags = 0; | 370 | int ioflags = 0; |
| 371 | ssize_t ret; | ||
| 372 | |||
| 373 | XFS_STATS_INC(xs_write_calls); | ||
| 111 | 374 | ||
| 112 | if (outfilp->f_mode & FMODE_NOCMTIME) | 375 | if (outfilp->f_mode & FMODE_NOCMTIME) |
| 113 | ioflags |= IO_INVIS; | 376 | ioflags |= IO_INVIS; |
| 114 | 377 | ||
| 115 | return xfs_splice_write(XFS_I(outfilp->f_path.dentry->d_inode), | 378 | if (XFS_FORCED_SHUTDOWN(ip->i_mount)) |
| 116 | pipe, outfilp, ppos, len, flags, ioflags); | 379 | return -EIO; |
| 380 | |||
| 381 | xfs_ilock(ip, XFS_IOLOCK_EXCL); | ||
| 382 | |||
| 383 | if (DM_EVENT_ENABLED(ip, DM_EVENT_WRITE) && !(ioflags & IO_INVIS)) { | ||
| 384 | int iolock = XFS_IOLOCK_EXCL; | ||
| 385 | int error; | ||
| 386 | |||
| 387 | error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, ip, *ppos, count, | ||
| 388 | FILP_DELAY_FLAG(outfilp), &iolock); | ||
| 389 | if (error) { | ||
| 390 | xfs_iunlock(ip, XFS_IOLOCK_EXCL); | ||
| 391 | return -error; | ||
| 392 | } | ||
| 393 | } | ||
| 394 | |||
| 395 | new_size = *ppos + count; | ||
| 396 | |||
| 397 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 398 | if (new_size > ip->i_size) | ||
| 399 | ip->i_new_size = new_size; | ||
| 400 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 401 | |||
| 402 | trace_xfs_file_splice_write(ip, count, *ppos, ioflags); | ||
| 403 | |||
| 404 | ret = generic_file_splice_write(pipe, outfilp, ppos, count, flags); | ||
| 405 | if (ret > 0) | ||
| 406 | XFS_STATS_ADD(xs_write_bytes, ret); | ||
| 407 | |||
| 408 | isize = i_size_read(inode); | ||
| 409 | if (unlikely(ret < 0 && ret != -EFAULT && *ppos > isize)) | ||
| 410 | *ppos = isize; | ||
| 411 | |||
| 412 | if (*ppos > ip->i_size) { | ||
| 413 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 414 | if (*ppos > ip->i_size) | ||
| 415 | ip->i_size = *ppos; | ||
| 416 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 417 | } | ||
| 418 | |||
| 419 | if (ip->i_new_size) { | ||
| 420 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 421 | ip->i_new_size = 0; | ||
| 422 | if (ip->i_d.di_size > ip->i_size) | ||
| 423 | ip->i_d.di_size = ip->i_size; | ||
| 424 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 425 | } | ||
| 426 | xfs_iunlock(ip, XFS_IOLOCK_EXCL); | ||
| 427 | return ret; | ||
| 428 | } | ||
| 429 | |||
| 430 | /* | ||
| 431 | * This routine is called to handle zeroing any space in the last | ||
| 432 | * block of the file that is beyond the EOF. We do this since the | ||
| 433 | * size is being increased without writing anything to that block | ||
| 434 | * and we don't want anyone to read the garbage on the disk. | ||
| 435 | */ | ||
| 436 | STATIC int /* error (positive) */ | ||
| 437 | xfs_zero_last_block( | ||
| 438 | xfs_inode_t *ip, | ||
| 439 | xfs_fsize_t offset, | ||
| 440 | xfs_fsize_t isize) | ||
| 441 | { | ||
| 442 | xfs_fileoff_t last_fsb; | ||
| 443 | xfs_mount_t *mp = ip->i_mount; | ||
| 444 | int nimaps; | ||
| 445 | int zero_offset; | ||
| 446 | int zero_len; | ||
| 447 | int error = 0; | ||
| 448 | xfs_bmbt_irec_t imap; | ||
| 449 | |||
| 450 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); | ||
| 451 | |||
| 452 | zero_offset = XFS_B_FSB_OFFSET(mp, isize); | ||
| 453 | if (zero_offset == 0) { | ||
| 454 | /* | ||
| 455 | * There are no extra bytes in the last block on disk to | ||
| 456 | * zero, so return. | ||
| 457 | */ | ||
| 458 | return 0; | ||
| 459 | } | ||
| 460 | |||
| 461 | last_fsb = XFS_B_TO_FSBT(mp, isize); | ||
| 462 | nimaps = 1; | ||
| 463 | error = xfs_bmapi(NULL, ip, last_fsb, 1, 0, NULL, 0, &imap, | ||
| 464 | &nimaps, NULL, NULL); | ||
| 465 | if (error) { | ||
| 466 | return error; | ||
| 467 | } | ||
| 468 | ASSERT(nimaps > 0); | ||
| 469 | /* | ||
| 470 | * If the block underlying isize is just a hole, then there | ||
| 471 | * is nothing to zero. | ||
| 472 | */ | ||
| 473 | if (imap.br_startblock == HOLESTARTBLOCK) { | ||
| 474 | return 0; | ||
| 475 | } | ||
| 476 | /* | ||
| 477 | * Zero the part of the last block beyond the EOF, and write it | ||
| 478 | * out sync. We need to drop the ilock while we do this so we | ||
| 479 | * don't deadlock when the buffer cache calls back to us. | ||
| 480 | */ | ||
| 481 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 482 | |||
| 483 | zero_len = mp->m_sb.sb_blocksize - zero_offset; | ||
| 484 | if (isize + zero_len > offset) | ||
| 485 | zero_len = offset - isize; | ||
| 486 | error = xfs_iozero(ip, isize, zero_len); | ||
| 487 | |||
| 488 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 489 | ASSERT(error >= 0); | ||
| 490 | return error; | ||
| 491 | } | ||
| 492 | |||
| 493 | /* | ||
| 494 | * Zero any on disk space between the current EOF and the new, | ||
| 495 | * larger EOF. This handles the normal case of zeroing the remainder | ||
| 496 | * of the last block in the file and the unusual case of zeroing blocks | ||
| 497 | * out beyond the size of the file. This second case only happens | ||
| 498 | * with fixed size extents and when the system crashes before the inode | ||
| 499 | * size was updated but after blocks were allocated. If fill is set, | ||
| 500 | * then any holes in the range are filled and zeroed. If not, the holes | ||
| 501 | * are left alone as holes. | ||
| 502 | */ | ||
| 503 | |||
| 504 | int /* error (positive) */ | ||
| 505 | xfs_zero_eof( | ||
| 506 | xfs_inode_t *ip, | ||
| 507 | xfs_off_t offset, /* starting I/O offset */ | ||
| 508 | xfs_fsize_t isize) /* current inode size */ | ||
| 509 | { | ||
| 510 | xfs_mount_t *mp = ip->i_mount; | ||
| 511 | xfs_fileoff_t start_zero_fsb; | ||
| 512 | xfs_fileoff_t end_zero_fsb; | ||
| 513 | xfs_fileoff_t zero_count_fsb; | ||
| 514 | xfs_fileoff_t last_fsb; | ||
| 515 | xfs_fileoff_t zero_off; | ||
| 516 | xfs_fsize_t zero_len; | ||
| 517 | int nimaps; | ||
| 518 | int error = 0; | ||
| 519 | xfs_bmbt_irec_t imap; | ||
| 520 | |||
| 521 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_IOLOCK_EXCL)); | ||
| 522 | ASSERT(offset > isize); | ||
| 523 | |||
| 524 | /* | ||
| 525 | * First handle zeroing the block on which isize resides. | ||
| 526 | * We only zero a part of that block so it is handled specially. | ||
| 527 | */ | ||
| 528 | error = xfs_zero_last_block(ip, offset, isize); | ||
| 529 | if (error) { | ||
| 530 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_IOLOCK_EXCL)); | ||
| 531 | return error; | ||
| 532 | } | ||
| 533 | |||
| 534 | /* | ||
| 535 | * Calculate the range between the new size and the old | ||
| 536 | * where blocks needing to be zeroed may exist. To get the | ||
| 537 | * block where the last byte in the file currently resides, | ||
| 538 | * we need to subtract one from the size and truncate back | ||
| 539 | * to a block boundary. We subtract 1 in case the size is | ||
| 540 | * exactly on a block boundary. | ||
| 541 | */ | ||
| 542 | last_fsb = isize ? XFS_B_TO_FSBT(mp, isize - 1) : (xfs_fileoff_t)-1; | ||
| 543 | start_zero_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)isize); | ||
| 544 | end_zero_fsb = XFS_B_TO_FSBT(mp, offset - 1); | ||
| 545 | ASSERT((xfs_sfiloff_t)last_fsb < (xfs_sfiloff_t)start_zero_fsb); | ||
| 546 | if (last_fsb == end_zero_fsb) { | ||
| 547 | /* | ||
| 548 | * The size was only incremented on its last block. | ||
| 549 | * We took care of that above, so just return. | ||
| 550 | */ | ||
| 551 | return 0; | ||
| 552 | } | ||
| 553 | |||
| 554 | ASSERT(start_zero_fsb <= end_zero_fsb); | ||
| 555 | while (start_zero_fsb <= end_zero_fsb) { | ||
| 556 | nimaps = 1; | ||
| 557 | zero_count_fsb = end_zero_fsb - start_zero_fsb + 1; | ||
| 558 | error = xfs_bmapi(NULL, ip, start_zero_fsb, zero_count_fsb, | ||
| 559 | 0, NULL, 0, &imap, &nimaps, NULL, NULL); | ||
| 560 | if (error) { | ||
| 561 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_IOLOCK_EXCL)); | ||
| 562 | return error; | ||
| 563 | } | ||
| 564 | ASSERT(nimaps > 0); | ||
| 565 | |||
| 566 | if (imap.br_state == XFS_EXT_UNWRITTEN || | ||
| 567 | imap.br_startblock == HOLESTARTBLOCK) { | ||
| 568 | /* | ||
| 569 | * This loop handles initializing pages that were | ||
| 570 | * partially initialized by the code below this | ||
| 571 | * loop. It basically zeroes the part of the page | ||
| 572 | * that sits on a hole and sets the page as P_HOLE | ||
| 573 | * and calls remapf if it is a mapped file. | ||
| 574 | */ | ||
| 575 | start_zero_fsb = imap.br_startoff + imap.br_blockcount; | ||
| 576 | ASSERT(start_zero_fsb <= (end_zero_fsb + 1)); | ||
| 577 | continue; | ||
| 578 | } | ||
| 579 | |||
| 580 | /* | ||
| 581 | * There are blocks we need to zero. | ||
| 582 | * Drop the inode lock while we're doing the I/O. | ||
| 583 | * We'll still have the iolock to protect us. | ||
| 584 | */ | ||
| 585 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 586 | |||
| 587 | zero_off = XFS_FSB_TO_B(mp, start_zero_fsb); | ||
| 588 | zero_len = XFS_FSB_TO_B(mp, imap.br_blockcount); | ||
| 589 | |||
| 590 | if ((zero_off + zero_len) > offset) | ||
| 591 | zero_len = offset - zero_off; | ||
| 592 | |||
| 593 | error = xfs_iozero(ip, zero_off, zero_len); | ||
| 594 | if (error) { | ||
| 595 | goto out_lock; | ||
| 596 | } | ||
| 597 | |||
| 598 | start_zero_fsb = imap.br_startoff + imap.br_blockcount; | ||
| 599 | ASSERT(start_zero_fsb <= (end_zero_fsb + 1)); | ||
| 600 | |||
| 601 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 602 | } | ||
| 603 | |||
| 604 | return 0; | ||
| 605 | |||
| 606 | out_lock: | ||
| 607 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 608 | ASSERT(error >= 0); | ||
| 609 | return error; | ||
| 610 | } | ||
| 611 | |||
| 612 | STATIC ssize_t | ||
| 613 | xfs_file_aio_write( | ||
| 614 | struct kiocb *iocb, | ||
| 615 | const struct iovec *iovp, | ||
| 616 | unsigned long nr_segs, | ||
| 617 | loff_t pos) | ||
| 618 | { | ||
| 619 | struct file *file = iocb->ki_filp; | ||
| 620 | struct address_space *mapping = file->f_mapping; | ||
| 621 | struct inode *inode = mapping->host; | ||
| 622 | struct xfs_inode *ip = XFS_I(inode); | ||
| 623 | struct xfs_mount *mp = ip->i_mount; | ||
| 624 | ssize_t ret = 0, error = 0; | ||
| 625 | int ioflags = 0; | ||
| 626 | xfs_fsize_t isize, new_size; | ||
| 627 | int iolock; | ||
| 628 | int eventsent = 0; | ||
| 629 | size_t ocount = 0, count; | ||
| 630 | int need_i_mutex; | ||
| 631 | |||
| 632 | XFS_STATS_INC(xs_write_calls); | ||
| 633 | |||
| 634 | BUG_ON(iocb->ki_pos != pos); | ||
| 635 | |||
| 636 | if (unlikely(file->f_flags & O_DIRECT)) | ||
| 637 | ioflags |= IO_ISDIRECT; | ||
| 638 | if (file->f_mode & FMODE_NOCMTIME) | ||
| 639 | ioflags |= IO_INVIS; | ||
| 640 | |||
| 641 | error = generic_segment_checks(iovp, &nr_segs, &ocount, VERIFY_READ); | ||
| 642 | if (error) | ||
| 643 | return error; | ||
| 644 | |||
| 645 | count = ocount; | ||
| 646 | if (count == 0) | ||
| 647 | return 0; | ||
| 648 | |||
| 649 | xfs_wait_for_freeze(mp, SB_FREEZE_WRITE); | ||
| 650 | |||
| 651 | if (XFS_FORCED_SHUTDOWN(mp)) | ||
| 652 | return -EIO; | ||
| 653 | |||
| 654 | relock: | ||
| 655 | if (ioflags & IO_ISDIRECT) { | ||
| 656 | iolock = XFS_IOLOCK_SHARED; | ||
| 657 | need_i_mutex = 0; | ||
| 658 | } else { | ||
| 659 | iolock = XFS_IOLOCK_EXCL; | ||
| 660 | need_i_mutex = 1; | ||
| 661 | mutex_lock(&inode->i_mutex); | ||
| 662 | } | ||
| 663 | |||
| 664 | xfs_ilock(ip, XFS_ILOCK_EXCL|iolock); | ||
| 665 | |||
| 666 | start: | ||
| 667 | error = -generic_write_checks(file, &pos, &count, | ||
| 668 | S_ISBLK(inode->i_mode)); | ||
| 669 | if (error) { | ||
| 670 | xfs_iunlock(ip, XFS_ILOCK_EXCL|iolock); | ||
| 671 | goto out_unlock_mutex; | ||
| 672 | } | ||
| 673 | |||
| 674 | if ((DM_EVENT_ENABLED(ip, DM_EVENT_WRITE) && | ||
| 675 | !(ioflags & IO_INVIS) && !eventsent)) { | ||
| 676 | int dmflags = FILP_DELAY_FLAG(file); | ||
| 677 | |||
| 678 | if (need_i_mutex) | ||
| 679 | dmflags |= DM_FLAGS_IMUX; | ||
| 680 | |||
| 681 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 682 | error = XFS_SEND_DATA(ip->i_mount, DM_EVENT_WRITE, ip, | ||
| 683 | pos, count, dmflags, &iolock); | ||
| 684 | if (error) { | ||
| 685 | goto out_unlock_internal; | ||
| 686 | } | ||
| 687 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 688 | eventsent = 1; | ||
| 689 | |||
| 690 | /* | ||
| 691 | * The iolock was dropped and reacquired in XFS_SEND_DATA | ||
| 692 | * so we have to recheck the size when appending. | ||
| 693 | * We will only "goto start;" once, since having sent the | ||
| 694 | * event prevents another call to XFS_SEND_DATA, which is | ||
| 695 | * what allows the size to change in the first place. | ||
| 696 | */ | ||
| 697 | if ((file->f_flags & O_APPEND) && pos != ip->i_size) | ||
| 698 | goto start; | ||
| 699 | } | ||
| 700 | |||
| 701 | if (ioflags & IO_ISDIRECT) { | ||
| 702 | xfs_buftarg_t *target = | ||
| 703 | XFS_IS_REALTIME_INODE(ip) ? | ||
| 704 | mp->m_rtdev_targp : mp->m_ddev_targp; | ||
| 705 | |||
| 706 | if ((pos & target->bt_smask) || (count & target->bt_smask)) { | ||
| 707 | xfs_iunlock(ip, XFS_ILOCK_EXCL|iolock); | ||
| 708 | return XFS_ERROR(-EINVAL); | ||
| 709 | } | ||
| 710 | |||
| 711 | if (!need_i_mutex && (mapping->nrpages || pos > ip->i_size)) { | ||
| 712 | xfs_iunlock(ip, XFS_ILOCK_EXCL|iolock); | ||
| 713 | iolock = XFS_IOLOCK_EXCL; | ||
| 714 | need_i_mutex = 1; | ||
| 715 | mutex_lock(&inode->i_mutex); | ||
| 716 | xfs_ilock(ip, XFS_ILOCK_EXCL|iolock); | ||
| 717 | goto start; | ||
| 718 | } | ||
| 719 | } | ||
| 720 | |||
| 721 | new_size = pos + count; | ||
| 722 | if (new_size > ip->i_size) | ||
| 723 | ip->i_new_size = new_size; | ||
| 724 | |||
| 725 | if (likely(!(ioflags & IO_INVIS))) | ||
| 726 | file_update_time(file); | ||
| 727 | |||
| 728 | /* | ||
| 729 | * If the offset is beyond the size of the file, we have a couple | ||
| 730 | * of things to do. First, if there is already space allocated | ||
| 731 | * we need to either create holes or zero the disk or ... | ||
| 732 | * | ||
| 733 | * If there is a page where the previous size lands, we need | ||
| 734 | * to zero it out up to the new size. | ||
| 735 | */ | ||
| 736 | |||
| 737 | if (pos > ip->i_size) { | ||
| 738 | error = xfs_zero_eof(ip, pos, ip->i_size); | ||
| 739 | if (error) { | ||
| 740 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 741 | goto out_unlock_internal; | ||
| 742 | } | ||
| 743 | } | ||
| 744 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 745 | |||
| 746 | /* | ||
| 747 | * If we're writing the file then make sure to clear the | ||
| 748 | * setuid and setgid bits if the process is not being run | ||
| 749 | * by root. This keeps people from modifying setuid and | ||
| 750 | * setgid binaries. | ||
| 751 | */ | ||
| 752 | error = -file_remove_suid(file); | ||
| 753 | if (unlikely(error)) | ||
| 754 | goto out_unlock_internal; | ||
| 755 | |||
| 756 | /* We can write back this queue in page reclaim */ | ||
| 757 | current->backing_dev_info = mapping->backing_dev_info; | ||
| 758 | |||
| 759 | if ((ioflags & IO_ISDIRECT)) { | ||
| 760 | if (mapping->nrpages) { | ||
| 761 | WARN_ON(need_i_mutex == 0); | ||
| 762 | error = xfs_flushinval_pages(ip, | ||
| 763 | (pos & PAGE_CACHE_MASK), | ||
| 764 | -1, FI_REMAPF_LOCKED); | ||
| 765 | if (error) | ||
| 766 | goto out_unlock_internal; | ||
| 767 | } | ||
| 768 | |||
| 769 | if (need_i_mutex) { | ||
| 770 | /* demote the lock now the cached pages are gone */ | ||
| 771 | xfs_ilock_demote(ip, XFS_IOLOCK_EXCL); | ||
| 772 | mutex_unlock(&inode->i_mutex); | ||
| 773 | |||
| 774 | iolock = XFS_IOLOCK_SHARED; | ||
| 775 | need_i_mutex = 0; | ||
| 776 | } | ||
| 777 | |||
| 778 | trace_xfs_file_direct_write(ip, count, iocb->ki_pos, ioflags); | ||
| 779 | ret = generic_file_direct_write(iocb, iovp, | ||
| 780 | &nr_segs, pos, &iocb->ki_pos, count, ocount); | ||
| 781 | |||
| 782 | /* | ||
| 783 | * direct-io write to a hole: fall through to buffered I/O | ||
| 784 | * for completing the rest of the request. | ||
| 785 | */ | ||
| 786 | if (ret >= 0 && ret != count) { | ||
| 787 | XFS_STATS_ADD(xs_write_bytes, ret); | ||
| 788 | |||
| 789 | pos += ret; | ||
| 790 | count -= ret; | ||
| 791 | |||
| 792 | ioflags &= ~IO_ISDIRECT; | ||
| 793 | xfs_iunlock(ip, iolock); | ||
| 794 | goto relock; | ||
| 795 | } | ||
| 796 | } else { | ||
| 797 | int enospc = 0; | ||
| 798 | ssize_t ret2 = 0; | ||
| 799 | |||
| 800 | write_retry: | ||
| 801 | trace_xfs_file_buffered_write(ip, count, iocb->ki_pos, ioflags); | ||
| 802 | ret2 = generic_file_buffered_write(iocb, iovp, nr_segs, | ||
| 803 | pos, &iocb->ki_pos, count, ret); | ||
| 804 | /* | ||
| 805 | * if we just got an ENOSPC, flush the inode now we | ||
| 806 | * aren't holding any page locks and retry *once* | ||
| 807 | */ | ||
| 808 | if (ret2 == -ENOSPC && !enospc) { | ||
| 809 | error = xfs_flush_pages(ip, 0, -1, 0, FI_NONE); | ||
| 810 | if (error) | ||
| 811 | goto out_unlock_internal; | ||
| 812 | enospc = 1; | ||
| 813 | goto write_retry; | ||
| 814 | } | ||
| 815 | ret = ret2; | ||
| 816 | } | ||
| 817 | |||
| 818 | current->backing_dev_info = NULL; | ||
| 819 | |||
| 820 | isize = i_size_read(inode); | ||
| 821 | if (unlikely(ret < 0 && ret != -EFAULT && iocb->ki_pos > isize)) | ||
| 822 | iocb->ki_pos = isize; | ||
| 823 | |||
| 824 | if (iocb->ki_pos > ip->i_size) { | ||
| 825 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 826 | if (iocb->ki_pos > ip->i_size) | ||
| 827 | ip->i_size = iocb->ki_pos; | ||
| 828 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 829 | } | ||
| 830 | |||
| 831 | if (ret == -ENOSPC && | ||
| 832 | DM_EVENT_ENABLED(ip, DM_EVENT_NOSPACE) && !(ioflags & IO_INVIS)) { | ||
| 833 | xfs_iunlock(ip, iolock); | ||
| 834 | if (need_i_mutex) | ||
| 835 | mutex_unlock(&inode->i_mutex); | ||
| 836 | error = XFS_SEND_NAMESP(ip->i_mount, DM_EVENT_NOSPACE, ip, | ||
| 837 | DM_RIGHT_NULL, ip, DM_RIGHT_NULL, NULL, NULL, | ||
| 838 | 0, 0, 0); /* Delay flag intentionally unused */ | ||
| 839 | if (need_i_mutex) | ||
| 840 | mutex_lock(&inode->i_mutex); | ||
| 841 | xfs_ilock(ip, iolock); | ||
| 842 | if (error) | ||
| 843 | goto out_unlock_internal; | ||
| 844 | goto start; | ||
| 845 | } | ||
| 846 | |||
| 847 | error = -ret; | ||
| 848 | if (ret <= 0) | ||
| 849 | goto out_unlock_internal; | ||
| 850 | |||
| 851 | XFS_STATS_ADD(xs_write_bytes, ret); | ||
| 852 | |||
| 853 | /* Handle various SYNC-type writes */ | ||
| 854 | if ((file->f_flags & O_DSYNC) || IS_SYNC(inode)) { | ||
| 855 | loff_t end = pos + ret - 1; | ||
| 856 | int error2; | ||
| 857 | |||
| 858 | xfs_iunlock(ip, iolock); | ||
| 859 | if (need_i_mutex) | ||
| 860 | mutex_unlock(&inode->i_mutex); | ||
| 861 | |||
| 862 | error2 = filemap_write_and_wait_range(mapping, pos, end); | ||
| 863 | if (!error) | ||
| 864 | error = error2; | ||
| 865 | if (need_i_mutex) | ||
| 866 | mutex_lock(&inode->i_mutex); | ||
| 867 | xfs_ilock(ip, iolock); | ||
| 868 | |||
| 869 | error2 = -xfs_file_fsync(file, file->f_path.dentry, | ||
| 870 | (file->f_flags & __O_SYNC) ? 0 : 1); | ||
| 871 | if (!error) | ||
| 872 | error = error2; | ||
| 873 | } | ||
| 874 | |||
| 875 | out_unlock_internal: | ||
| 876 | if (ip->i_new_size) { | ||
| 877 | xfs_ilock(ip, XFS_ILOCK_EXCL); | ||
| 878 | ip->i_new_size = 0; | ||
| 879 | /* | ||
| 880 | * If this was a direct or synchronous I/O that failed (such | ||
| 881 | * as ENOSPC) then part of the I/O may have been written to | ||
| 882 | * disk before the error occured. In this case the on-disk | ||
| 883 | * file size may have been adjusted beyond the in-memory file | ||
| 884 | * size and now needs to be truncated back. | ||
| 885 | */ | ||
| 886 | if (ip->i_d.di_size > ip->i_size) | ||
| 887 | ip->i_d.di_size = ip->i_size; | ||
| 888 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | ||
| 889 | } | ||
| 890 | xfs_iunlock(ip, iolock); | ||
| 891 | out_unlock_mutex: | ||
| 892 | if (need_i_mutex) | ||
| 893 | mutex_unlock(&inode->i_mutex); | ||
| 894 | return -error; | ||
| 117 | } | 895 | } |
| 118 | 896 | ||
| 119 | STATIC int | 897 | STATIC int |
| @@ -160,28 +938,6 @@ xfs_file_release( | |||
| 160 | return -xfs_release(XFS_I(inode)); | 938 | return -xfs_release(XFS_I(inode)); |
| 161 | } | 939 | } |
| 162 | 940 | ||
| 163 | /* | ||
| 164 | * We ignore the datasync flag here because a datasync is effectively | ||
| 165 | * identical to an fsync. That is, datasync implies that we need to write | ||
| 166 | * only the metadata needed to be able to access the data that is written | ||
| 167 | * if we crash after the call completes. Hence if we are writing beyond | ||
| 168 | * EOF we have to log the inode size change as well, which makes it a | ||
| 169 | * full fsync. If we don't write beyond EOF, the inode core will be | ||
| 170 | * clean in memory and so we don't need to log the inode, just like | ||
| 171 | * fsync. | ||
| 172 | */ | ||
| 173 | STATIC int | ||
| 174 | xfs_file_fsync( | ||
| 175 | struct file *file, | ||
| 176 | struct dentry *dentry, | ||
| 177 | int datasync) | ||
| 178 | { | ||
| 179 | struct xfs_inode *ip = XFS_I(dentry->d_inode); | ||
| 180 | |||
| 181 | xfs_iflags_clear(ip, XFS_ITRUNCATED); | ||
| 182 | return -xfs_fsync(ip); | ||
| 183 | } | ||
| 184 | |||
| 185 | STATIC int | 941 | STATIC int |
| 186 | xfs_file_readdir( | 942 | xfs_file_readdir( |
| 187 | struct file *filp, | 943 | struct file *filp, |
| @@ -203,9 +959,9 @@ xfs_file_readdir( | |||
| 203 | * | 959 | * |
| 204 | * Try to give it an estimate that's good enough, maybe at some | 960 | * Try to give it an estimate that's good enough, maybe at some |
| 205 | * point we can change the ->readdir prototype to include the | 961 | * point we can change the ->readdir prototype to include the |
| 206 | * buffer size. | 962 | * buffer size. For now we use the current glibc buffer size. |
| 207 | */ | 963 | */ |
| 208 | bufsize = (size_t)min_t(loff_t, PAGE_SIZE, ip->i_d.di_size); | 964 | bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size); |
| 209 | 965 | ||
| 210 | error = xfs_readdir(ip, dirent, bufsize, | 966 | error = xfs_readdir(ip, dirent, bufsize, |
| 211 | (xfs_off_t *)&filp->f_pos, filldir); | 967 | (xfs_off_t *)&filp->f_pos, filldir); |
