projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
fs
/
affs
/
symlink.c
diff --git
a/fs/affs/symlink.c
b/fs/affs/symlink.c
index f39b71c3981e7d5db936820f07f0ca722314a6af..ea5b69a18ba9ce9165d8ea083bfffbb40e13a600 100644
(file)
--- a/
fs/affs/symlink.c
+++ b/
fs/affs/symlink.c
@@
-16,14
+16,12
@@
static int affs_symlink_readpage(struct file *file, struct page *page)
struct inode *inode = page->mapping->host;
char *link = kmap(page);
struct slink_front *lf;
struct inode *inode = page->mapping->host;
char *link = kmap(page);
struct slink_front *lf;
- int err;
int i, j;
char c;
char lc;
pr_debug("follow_link(ino=%lu)\n", inode->i_ino);
int i, j;
char c;
char lc;
pr_debug("follow_link(ino=%lu)\n", inode->i_ino);
- err = -EIO;
bh = affs_bread(inode->i_sb, inode->i_ino);
if (!bh)
goto fail;
bh = affs_bread(inode->i_sb, inode->i_ino);
if (!bh)
goto fail;
@@
-66,7
+64,7
@@
fail:
SetPageError(page);
kunmap(page);
unlock_page(page);
SetPageError(page);
kunmap(page);
unlock_page(page);
- return
err
;
+ return
-EIO
;
}
const struct address_space_operations affs_symlink_aops = {
}
const struct address_space_operations affs_symlink_aops = {