diff options
| author | Joel Becker <joel.becker@oracle.com> | 2009-02-12 16:41:25 -0800 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-09-04 16:07:50 -0700 |
| commit | 0cf2f7632b1789b811ab20b611c4156e6de2b055 (patch) | |
| tree | 34f7cf3584e4fa2bc187d4b75ce052cb98739b0e /fs/ocfs2/aops.c | |
| parent | 292dd27ec76b96cebcef576f330ab121f59ccf05 (diff) | |
| download | kernel-crypto-0cf2f7632b1789b811ab20b611c4156e6de2b055.tar.gz kernel-crypto-0cf2f7632b1789b811ab20b611c4156e6de2b055.tar.xz kernel-crypto-0cf2f7632b1789b811ab20b611c4156e6de2b055.zip | |
ocfs2: Pass struct ocfs2_caching_info to the journal functions.
The next step in divorcing metadata I/O management from struct inode is
to pass struct ocfs2_caching_info to the journal functions. Thus the
journal locks a metadata cache with the cache io_lock function. It also
can compare ci_last_trans and ci_created_trans directly.
This is a large patch because of all the places we change
ocfs2_journal_access..(handle, inode, ...) to
ocfs2_journal_access..(handle, INODE_CACHE(inode), ...).
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/aops.c')
| -rw-r--r-- | fs/ocfs2/aops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 8a1e61545f4..49eef2c6f4a 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -1528,7 +1528,7 @@ static int ocfs2_write_begin_inline(struct address_space *mapping, goto out; } - ret = ocfs2_journal_access_di(handle, inode, wc->w_di_bh, + ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh, OCFS2_JOURNAL_ACCESS_WRITE); if (ret) { ocfs2_commit_trans(osb, handle); @@ -1773,7 +1773,7 @@ int ocfs2_write_begin_nolock(struct address_space *mapping, * We don't want this to fail in ocfs2_write_end(), so do it * here. */ - ret = ocfs2_journal_access_di(handle, inode, wc->w_di_bh, + ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh, OCFS2_JOURNAL_ACCESS_WRITE); if (ret) { mlog_errno(ret); |