diff options
author | Mike Marshall <hubcap@omnibond.com> | 2016-03-14 15:39:42 -0400 |
---|---|---|
committer | Mike Marshall <hubcap@omnibond.com> | 2016-03-14 15:39:42 -0400 |
commit | ab6652524aaf834d5dcdb46dd7695813b8d63da5 (patch) | |
tree | bb3876a9b61254be902416f7dbf578deb28e9f22 /fs/efs/symlink.c | |
parent | acfcbaf1925f2dc5c46c61de69d756dec92a2ff8 (diff) | |
parent | b562e44f507e863c6792946e4e1b1449fbbac85d (diff) | |
download | op-kernel-dev-ab6652524aaf834d5dcdb46dd7695813b8d63da5.zip op-kernel-dev-ab6652524aaf834d5dcdb46dd7695813b8d63da5.tar.gz |
Orangefs: merge to v4.5
Merge tag 'v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current
Linux 4.5
Diffstat (limited to 'fs/efs/symlink.c')
-rw-r--r-- | fs/efs/symlink.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/efs/symlink.c b/fs/efs/symlink.c index 75117d0..4870cc8 100644 --- a/fs/efs/symlink.c +++ b/fs/efs/symlink.c @@ -13,7 +13,7 @@ static int efs_symlink_readpage(struct file *file, struct page *page) { - char *link = kmap(page); + char *link = page_address(page); struct buffer_head * bh; struct inode * inode = page->mapping->host; efs_block_t size = inode->i_size; @@ -39,12 +39,10 @@ static int efs_symlink_readpage(struct file *file, struct page *page) } link[size] = '\0'; SetPageUptodate(page); - kunmap(page); unlock_page(page); return 0; fail: SetPageError(page); - kunmap(page); unlock_page(page); return err; } |