diff options
Diffstat (limited to 'fs/logfs/dir.c')
-rw-r--r-- | fs/logfs/dir.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c index 3de7a32cadbe..1b6e21dda286 100644 --- a/fs/logfs/dir.c +++ b/fs/logfs/dir.c | |||
@@ -177,17 +177,17 @@ static struct page *logfs_get_dd_page(struct inode *dir, struct dentry *dentry) | |||
177 | (filler_t *)logfs_readpage, NULL); | 177 | (filler_t *)logfs_readpage, NULL); |
178 | if (IS_ERR(page)) | 178 | if (IS_ERR(page)) |
179 | return page; | 179 | return page; |
180 | dd = kmap_atomic(page, KM_USER0); | 180 | dd = kmap_atomic(page); |
181 | BUG_ON(dd->namelen == 0); | 181 | BUG_ON(dd->namelen == 0); |
182 | 182 | ||
183 | if (name->len != be16_to_cpu(dd->namelen) || | 183 | if (name->len != be16_to_cpu(dd->namelen) || |
184 | memcmp(name->name, dd->name, name->len)) { | 184 | memcmp(name->name, dd->name, name->len)) { |
185 | kunmap_atomic(dd, KM_USER0); | 185 | kunmap_atomic(dd); |
186 | page_cache_release(page); | 186 | page_cache_release(page); |
187 | continue; | 187 | continue; |
188 | } | 188 | } |
189 | 189 | ||
190 | kunmap_atomic(dd, KM_USER0); | 190 | kunmap_atomic(dd); |
191 | return page; | 191 | return page; |
192 | } | 192 | } |
193 | return NULL; | 193 | return NULL; |
@@ -365,9 +365,9 @@ static struct dentry *logfs_lookup(struct inode *dir, struct dentry *dentry, | |||
365 | return NULL; | 365 | return NULL; |
366 | } | 366 | } |
367 | index = page->index; | 367 | index = page->index; |
368 | dd = kmap_atomic(page, KM_USER0); | 368 | dd = kmap_atomic(page); |
369 | ino = be64_to_cpu(dd->ino); | 369 | ino = be64_to_cpu(dd->ino); |
370 | kunmap_atomic(dd, KM_USER0); | 370 | kunmap_atomic(dd); |
371 | page_cache_release(page); | 371 | page_cache_release(page); |
372 | 372 | ||
373 | inode = logfs_iget(dir->i_sb, ino); | 373 | inode = logfs_iget(dir->i_sb, ino); |
@@ -402,12 +402,12 @@ static int logfs_write_dir(struct inode *dir, struct dentry *dentry, | |||
402 | if (!page) | 402 | if (!page) |
403 | return -ENOMEM; | 403 | return -ENOMEM; |
404 | 404 | ||
405 | dd = kmap_atomic(page, KM_USER0); | 405 | dd = kmap_atomic(page); |
406 | memset(dd, 0, sizeof(*dd)); | 406 | memset(dd, 0, sizeof(*dd)); |
407 | dd->ino = cpu_to_be64(inode->i_ino); | 407 | dd->ino = cpu_to_be64(inode->i_ino); |
408 | dd->type = logfs_type(inode); | 408 | dd->type = logfs_type(inode); |
409 | logfs_set_name(dd, &dentry->d_name); | 409 | logfs_set_name(dd, &dentry->d_name); |
410 | kunmap_atomic(dd, KM_USER0); | 410 | kunmap_atomic(dd); |
411 | 411 | ||
412 | err = logfs_write_buf(dir, page, WF_LOCK); | 412 | err = logfs_write_buf(dir, page, WF_LOCK); |
413 | unlock_page(page); | 413 | unlock_page(page); |
@@ -579,9 +579,9 @@ static int logfs_get_dd(struct inode *dir, struct dentry *dentry, | |||
579 | if (IS_ERR(page)) | 579 | if (IS_ERR(page)) |
580 | return PTR_ERR(page); | 580 | return PTR_ERR(page); |
581 | *pos = page->index; | 581 | *pos = page->index; |
582 | map = kmap_atomic(page, KM_USER0); | 582 | map = kmap_atomic(page); |
583 | memcpy(dd, map, sizeof(*dd)); | 583 | memcpy(dd, map, sizeof(*dd)); |
584 | kunmap_atomic(map, KM_USER0); | 584 | kunmap_atomic(map); |
585 | page_cache_release(page); | 585 | page_cache_release(page); |
586 | return 0; | 586 | return 0; |
587 | } | 587 | } |