git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
fs
/
ntfs
/
aops.h
diff --git
a/fs/ntfs/aops.h
b/fs/ntfs/aops.h
index 934d5f79b9e7a1fc992367dfd1381edbef1ed8ac..0cac5458c023ea594f11eefdd0e0650fdeb36c2b 100644
(file)
--- a/
fs/ntfs/aops.h
+++ b/
fs/ntfs/aops.h
@@
-74,13
+74,8
@@
static inline struct page *ntfs_map_page(struct address_space *mapping,
{
struct page *page = read_mapping_page(mapping, index, NULL);
- if (!IS_ERR(page))
{
+ if (!IS_ERR(page))
kmap(page);
- if (!PageError(page))
- return page;
- ntfs_unmap_page(page);
- return ERR_PTR(-EIO);
- }
return page;
}