diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-12 11:08:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-12 11:08:13 +0100 |
| commit | c0c57019a65341f08858541d2740b74dee821cf1 (patch) | |
| tree | 584ac03f7dfa26c9c45c3d66ad306222e893fa33 /fs/ubifs/file.c | |
| parent | 8c31902cffc4d716450be549c66a67a8a3dd479c (diff) | |
| parent | ae8a52185e5c070cf4510b323dbc1b9e46b897d6 (diff) | |
| download | op-kernel-dev-c0c57019a65341f08858541d2740b74dee821cf1.zip op-kernel-dev-c0c57019a65341f08858541d2740b74dee821cf1.tar.gz | |
Merge commit 'linus' into x86/urgent, to pick up recent x86 changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ubifs/file.c')
| -rw-r--r-- | fs/ubifs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 0edc128..eff6280 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1608,7 +1608,7 @@ const struct inode_operations ubifs_file_inode_operations = { const struct inode_operations ubifs_symlink_inode_operations = { .readlink = generic_readlink, - .follow_link = simple_follow_link, + .get_link = simple_get_link, .setattr = ubifs_setattr, .getattr = ubifs_getattr, .setxattr = ubifs_setxattr, |
