diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-01-25 21:46:21 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-01-25 21:46:21 +0300 |
| commit | 7e3b1207705c10ada363bbc7d0235730ce1f5b79 (patch) | |
| tree | cd1eb567acb4e72c1bdfbe8b59746c73b8627ee5 /fs/qnx6/inode.c | |
| parent | 143c6fe3a415edf2dde3f507b3a00998b4c4001e (diff) | |
| parent | 20437f79f6627a31752f422688a6047c25cefcf1 (diff) | |
| download | linux-7e3b1207705c10ada363bbc7d0235730ce1f5b79.tar.xz | |
Merge branch 'enable-devices' into omap-for-v4.5/fixes
Diffstat (limited to 'fs/qnx6/inode.c')
| -rw-r--r-- | fs/qnx6/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c index 32d2e1a9774c..47bb1de07155 100644 --- a/fs/qnx6/inode.c +++ b/fs/qnx6/inode.c @@ -582,6 +582,7 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino) inode->i_mapping->a_ops = &qnx6_aops; } else if (S_ISLNK(inode->i_mode)) { inode->i_op = &page_symlink_inode_operations; + inode_nohighmem(inode); inode->i_mapping->a_ops = &qnx6_aops; } else init_special_inode(inode, inode->i_mode, 0); @@ -624,7 +625,7 @@ static int init_inodecache(void) qnx6_inode_cachep = kmem_cache_create("qnx6_inode_cache", sizeof(struct qnx6_inode_info), 0, (SLAB_RECLAIM_ACCOUNT| - SLAB_MEM_SPREAD), + SLAB_MEM_SPREAD|SLAB_ACCOUNT), init_once); if (!qnx6_inode_cachep) return -ENOMEM; |