diff options
| author | Tao Ma <tao.ma@oracle.com> | 2010-08-12 10:27:14 +0800 |
|---|---|---|
| committer | Tao Ma <tao.ma@oracle.com> | 2010-08-12 10:39:52 +0800 |
| commit | b890823635e022467b924e3d9da8c5166a4e349c (patch) | |
| tree | 0fbd6c0051c51b0d03df82b8c7203dfc868b383a /fs/ocfs2/file.c | |
| parent | 0378da0fda6edf5aaffda6f1248a78986bd955b5 (diff) | |
| download | kernel_samsung_smdk4412-b890823635e022467b924e3d9da8c5166a4e349c.zip kernel_samsung_smdk4412-b890823635e022467b924e3d9da8c5166a4e349c.tar.gz kernel_samsung_smdk4412-b890823635e022467b924e3d9da8c5166a4e349c.tar.bz2 | |
ocfs2: pass struct file* to ocfs2_prepare_inode_for_write.
struct file * has file_ra_state to store the readahead state
and data. So pass this to ocfs2_prepare_inode_for_write. so
that it can be used in ocfs2_refcount_cow.
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Diffstat (limited to 'fs/ocfs2/file.c')
| -rw-r--r-- | fs/ocfs2/file.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 81296b4..5920159 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2053,6 +2053,7 @@ out: } static int ocfs2_prepare_inode_for_refcount(struct inode *inode, + struct file *file, loff_t pos, size_t count, int *meta_level) { @@ -2078,7 +2079,7 @@ out: return ret; } -static int ocfs2_prepare_inode_for_write(struct dentry *dentry, +static int ocfs2_prepare_inode_for_write(struct file *file, loff_t *ppos, size_t count, int appending, @@ -2086,6 +2087,7 @@ static int ocfs2_prepare_inode_for_write(struct dentry *dentry, int *has_refcount) { int ret = 0, meta_level = 0; + struct dentry *dentry = file->f_path.dentry; struct inode *inode = dentry->d_inode; loff_t saved_pos, end; @@ -2141,6 +2143,7 @@ static int ocfs2_prepare_inode_for_write(struct dentry *dentry, meta_level = -1; ret = ocfs2_prepare_inode_for_refcount(inode, + file, saved_pos, count, &meta_level); @@ -2255,7 +2258,7 @@ relock: } can_do_direct = direct_io; - ret = ocfs2_prepare_inode_for_write(file->f_path.dentry, ppos, + ret = ocfs2_prepare_inode_for_write(file, ppos, iocb->ki_left, appending, &can_do_direct, &has_refcount); if (ret < 0) { @@ -2385,7 +2388,7 @@ static int ocfs2_splice_to_file(struct pipe_inode_info *pipe, { int ret; - ret = ocfs2_prepare_inode_for_write(out->f_path.dentry, &sd->pos, + ret = ocfs2_prepare_inode_for_write(out, &sd->pos, sd->total_len, 0, NULL, NULL); if (ret < 0) { mlog_errno(ret); |