aboutsummaryrefslogtreecommitdiffstats
path: root/fs/logfs/dir.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-04-05 11:37:28 +0900
committerTejun Heo <tj@kernel.org>2010-04-05 11:37:28 +0900
commit336f5899d287f06d8329e208fc14ce50f7ec9698 (patch)
tree9b762d450d5eb248a6ff8317badb7e223d93ed58 /fs/logfs/dir.c
parenta4ab2773205e8b94c18625455f85e3b6bb9d7ad6 (diff)
parentdb217dece3003df0841bacf9556b5c06aa097dae (diff)
downloadkernel_samsung_smdk4412-336f5899d287f06d8329e208fc14ce50f7ec9698.zip
kernel_samsung_smdk4412-336f5899d287f06d8329e208fc14ce50f7ec9698.tar.gz
kernel_samsung_smdk4412-336f5899d287f06d8329e208fc14ce50f7ec9698.tar.bz2
Merge branch 'master' into export-slabh
Diffstat (limited to 'fs/logfs/dir.c')
-rw-r--r--fs/logfs/dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index e1cb995..2396a85 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -303,12 +303,12 @@ static int __logfs_readdir(struct file *file, void *buf, filldir_t filldir)
(filler_t *)logfs_readpage, NULL);
if (IS_ERR(page))
return PTR_ERR(page);
- dd = kmap_atomic(page, KM_USER0);
+ dd = kmap(page);
BUG_ON(dd->namelen == 0);
full = filldir(buf, (char *)dd->name, be16_to_cpu(dd->namelen),
pos, be64_to_cpu(dd->ino), dd->type);
- kunmap_atomic(dd, KM_USER0);
+ kunmap(page);
page_cache_release(page);
if (full)
break;