and changed files

[powerpc.git] / fs / ocfs2 / file.c

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 5fd49ec..9395b4f 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -207,16 +207,16 @@ out:
        return ret;
 }
 
-int ocfs2_set_inode_size(handle_t *handle,
-                        struct inode *inode,
-                        struct buffer_head *fe_bh,
-                        u64 new_i_size)
+static int ocfs2_set_inode_size(handle_t *handle,
+                               struct inode *inode,
+                               struct buffer_head *fe_bh,
+                               u64 new_i_size)
 {
        int status;
 
        mlog_entry_void();
        i_size_write(inode, new_i_size);
-       inode->i_blocks = ocfs2_align_bytes_to_sectors(new_i_size);
+       inode->i_blocks = ocfs2_inode_sector_count(inode);
        inode->i_ctime = inode->i_mtime = CURRENT_TIME;
 
        status = ocfs2_mark_inode_dirty(handle, inode, fe_bh);
@@ -713,7 +713,8 @@ restarted_transaction:
        }
 
        mlog(0, "fe: i_clusters = %u, i_size=%llu\n",
-            fe->i_clusters, (unsigned long long)fe->i_size);
+            le32_to_cpu(fe->i_clusters),
+            (unsigned long long)le64_to_cpu(fe->i_size));
        mlog(0, "inode: ip_clusters=%u, i_size=%lld\n",
             OCFS2_I(inode)->ip_clusters, i_size_read(inode));
 
@@ -1542,7 +1543,7 @@ relock:
        pos = *ppos;
 
        /* communicate with ocfs2_dio_end_io */
-       ocfs2_iocb_set_rw_locked(iocb);
+       ocfs2_iocb_set_rw_locked(iocb, rw_level);
 
        if (direct_io) {
                written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos,
@@ -1603,6 +1604,84 @@ out_sems:
        return written ? written : ret;
 }
 
+static int ocfs2_splice_write_actor(struct pipe_inode_info *pipe,
+                                   struct pipe_buffer *buf,
+                                   struct splice_desc *sd)
+{
+       int ret, count, total = 0;
+       ssize_t copied = 0;
+       struct ocfs2_splice_write_priv sp;
+
+       ret = buf->ops->pin(pipe, buf);
+       if (ret)
+               goto out;
+
+       sp.s_sd = sd;
+       sp.s_buf = buf;
+       sp.s_pipe = pipe;
+       sp.s_offset = sd->pos & ~PAGE_CACHE_MASK;
+       sp.s_buf_offset = buf->offset;
+
+       count = sd->len;
+       if (count + sp.s_offset > PAGE_CACHE_SIZE)
+               count = PAGE_CACHE_SIZE - sp.s_offset;
+
+       do {
+               /*
+                * splice wants us to copy up to one page at a
+                * time. For pagesize > cluster size, this means we
+                * might enter ocfs2_buffered_write_cluster() more
+                * than once, so keep track of our progress here.
+                */
+               copied = ocfs2_buffered_write_cluster(sd->file,
+                                                     (loff_t)sd->pos + total,
+                                                     count,
+                                                     ocfs2_map_and_write_splice_data,
+                                                     &sp);
+               if (copied < 0) {
+                       mlog_errno(copied);
+                       ret = copied;
+                       goto out;
+               }
+
+               count -= copied;
+               sp.s_offset += copied;
+               sp.s_buf_offset += copied;
+               total += copied;
+       } while (count);
+
+       ret = 0;
+out:
+
+       return total ? total : ret;
+}
+
+static ssize_t __ocfs2_file_splice_write(struct pipe_inode_info *pipe,
+                                        struct file *out,
+                                        loff_t *ppos,
+                                        size_t len,
+                                        unsigned int flags)
+{
+       int ret, err;
+       struct address_space *mapping = out->f_mapping;
+       struct inode *inode = mapping->host;
+
+       ret = __splice_from_pipe(pipe, out, ppos, len, flags,
+                                ocfs2_splice_write_actor);
+       if (ret > 0) {
+               *ppos += ret;
+
+               if (unlikely((out->f_flags & O_SYNC) || IS_SYNC(inode))) {
+                       err = generic_osync_inode(inode, mapping,
+                                                 OSYNC_METADATA|OSYNC_DATA);
+                       if (err)
+                               ret = err;
+               }
+       }
+
+       return ret;
+}
+
 static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe,
                                       struct file *out,
                                       loff_t *ppos,
@@ -1633,7 +1712,7 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe,
        }
 
        /* ok, we're done with i_size and alloc work */
-       ret = generic_file_splice_write_nolock(pipe, out, ppos, len, flags);
+       ret = __ocfs2_file_splice_write(pipe, out, ppos, len, flags);
 
 out_unlock:
        ocfs2_rw_unlock(inode, 1);
@@ -1710,7 +1789,7 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb,
                }
                rw_level = 0;
                /* communicate with ocfs2_dio_end_io */
-               ocfs2_iocb_set_rw_locked(iocb);
+               ocfs2_iocb_set_rw_locked(iocb, rw_level);
        }
 
        /*
@@ -1775,6 +1854,9 @@ const struct file_operations ocfs2_fops = {
        .aio_read       = ocfs2_file_aio_read,
        .aio_write      = ocfs2_file_aio_write,
        .ioctl          = ocfs2_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = ocfs2_compat_ioctl,
+#endif
        .splice_read    = ocfs2_file_splice_read,
        .splice_write   = ocfs2_file_splice_write,
 };
@@ -1784,4 +1866,7 @@ const struct file_operations ocfs2_dops = {
        .readdir        = ocfs2_readdir,
        .fsync          = ocfs2_sync_file,
        .ioctl          = ocfs2_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = ocfs2_compat_ioctl,
+#endif
 };