diff options
| author | Mark Fasheh <mark.fasheh@oracle.com> | 2007-10-18 15:30:42 -0700 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2008-01-25 14:46:01 -0800 |
| commit | e63aecb651ba73dffc62f9608ee1b7ae2a0ffd4b (patch) | |
| tree | 06a4b727230120fe73421dc3149c21aaed5fe91e /fs/ocfs2/dir.c | |
| parent | c934a92d05b549dd2f25db72c5fc3cb9dcf1b611 (diff) | |
| download | op-kernel-dev-e63aecb651ba73dffc62f9608ee1b7ae2a0ffd4b.zip op-kernel-dev-e63aecb651ba73dffc62f9608ee1b7ae2a0ffd4b.tar.gz | |
ocfs2: Rename ocfs2_meta_[un]lock
Call this the "inode_lock" now, since it covers both data and meta data.
This patch makes no functional changes.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/dir.c')
| -rw-r--r-- | fs/ocfs2/dir.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 63b28fd..6b0107f 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -846,14 +846,14 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir) mlog_entry("dirino=%llu\n", (unsigned long long)OCFS2_I(inode)->ip_blkno); - error = ocfs2_meta_lock_atime(inode, filp->f_vfsmnt, &lock_level); + error = ocfs2_inode_lock_atime(inode, filp->f_vfsmnt, &lock_level); if (lock_level && error >= 0) { /* We release EX lock which used to update atime * and get PR lock again to reduce contention * on commonly accessed directories. */ - ocfs2_meta_unlock(inode, 1); + ocfs2_inode_unlock(inode, 1); lock_level = 0; - error = ocfs2_meta_lock(inode, NULL, 0); + error = ocfs2_inode_lock(inode, NULL, 0); } if (error < 0) { if (error != -ENOENT) @@ -865,7 +865,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir) error = ocfs2_dir_foreach_blk(inode, &filp->f_version, &filp->f_pos, dirent, filldir, NULL); - ocfs2_meta_unlock(inode, lock_level); + ocfs2_inode_unlock(inode, lock_level); bail_nolock: mlog_exit(error); |
