diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-01-25 19:46:21 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-01-25 19:46:21 +0100 |
| commit | 7e3b1207705c10ada363bbc7d0235730ce1f5b79 (patch) | |
| tree | cd1eb567acb4e72c1bdfbe8b59746c73b8627ee5 /fs/ufs/inode.c | |
| parent | ARM: omap2plus_defconfig: Enable ARM_KERNMEM_PERMS and few loadable modules (diff) | |
| parent | ARM: OMAP: Add PWM dmtimer platform data quirks (diff) | |
| download | linux-7e3b1207705c10ada363bbc7d0235730ce1f5b79.tar.xz linux-7e3b1207705c10ada363bbc7d0235730ce1f5b79.zip | |
Merge branch 'enable-devices' into omap-for-v4.5/fixes
Diffstat (limited to 'fs/ufs/inode.c')
| -rw-r--r-- | fs/ufs/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index a064cf44b143..d897e169ab9c 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -528,11 +528,12 @@ static void ufs_set_inode_ops(struct inode *inode) inode->i_mapping->a_ops = &ufs_aops; } else if (S_ISLNK(inode->i_mode)) { if (!inode->i_blocks) { - inode->i_op = &ufs_fast_symlink_inode_operations; inode->i_link = (char *)UFS_I(inode)->i_u1.i_symlink; + inode->i_op = &simple_symlink_inode_operations; } else { - inode->i_op = &ufs_symlink_inode_operations; inode->i_mapping->a_ops = &ufs_aops; + inode->i_op = &page_symlink_inode_operations; + inode_nohighmem(inode); } } else init_special_inode(inode, inode->i_mode, |