diff options
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 63b28fdceb4a..6b0107f21344 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) | |||
846 | mlog_entry("dirino=%llu\n", | 846 | mlog_entry("dirino=%llu\n", |
847 | (unsigned long long)OCFS2_I(inode)->ip_blkno); | 847 | (unsigned long long)OCFS2_I(inode)->ip_blkno); |
848 | 848 | ||
849 | error = ocfs2_meta_lock_atime(inode, filp->f_vfsmnt, &lock_level); | 849 | error = ocfs2_inode_lock_atime(inode, filp->f_vfsmnt, &lock_level); |
850 | if (lock_level && error >= 0) { | 850 | if (lock_level && error >= 0) { |
851 | /* We release EX lock which used to update atime | 851 | /* We release EX lock which used to update atime |
852 | * and get PR lock again to reduce contention | 852 | * and get PR lock again to reduce contention |
853 | * on commonly accessed directories. */ | 853 | * on commonly accessed directories. */ |
854 | ocfs2_meta_unlock(inode, 1); | 854 | ocfs2_inode_unlock(inode, 1); |
855 | lock_level = 0; | 855 | lock_level = 0; |
856 | error = ocfs2_meta_lock(inode, NULL, 0); | 856 | error = ocfs2_inode_lock(inode, NULL, 0); |
857 | } | 857 | } |
858 | if (error < 0) { | 858 | if (error < 0) { |
859 | if (error != -ENOENT) | 859 | if (error != -ENOENT) |
@@ -865,7 +865,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir) | |||
865 | error = ocfs2_dir_foreach_blk(inode, &filp->f_version, &filp->f_pos, | 865 | error = ocfs2_dir_foreach_blk(inode, &filp->f_version, &filp->f_pos, |
866 | dirent, filldir, NULL); | 866 | dirent, filldir, NULL); |
867 | 867 | ||
868 | ocfs2_meta_unlock(inode, lock_level); | 868 | ocfs2_inode_unlock(inode, lock_level); |
869 | 869 | ||
870 | bail_nolock: | 870 | bail_nolock: |
871 | mlog_exit(error); | 871 | mlog_exit(error); |