summaryrefslogtreecommitdiff
path: root/fs/jfs/inode.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-21 12:30:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-21 12:30:07 -0700
commit9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0 (patch)
tree1270f24f89f10d832e879dd1352ef0209dd3aebe /fs/jfs/inode.c
parenta486b0af797e19ff79c6943cc8986111f2569fe8 (diff)
parentc7f2e1f0ac142a657a1de00d404e1c8345b20598 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: add jfs specific ->setattr call jfs: fix diAllocExt error in resizing filesystem jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g
Diffstat (limited to 'fs/jfs/inode.c')
-rw-r--r--fs/jfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 9dd126276c9f..ed9ba6fe04f5 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -61,7 +61,7 @@ struct inode *jfs_iget(struct super_block *sb, unsigned long ino)
inode->i_op = &page_symlink_inode_operations;
inode->i_mapping->a_ops = &jfs_aops;
} else {
- inode->i_op = &jfs_symlink_inode_operations;
+ inode->i_op = &jfs_fast_symlink_inode_operations;
/*
* The inline data should be null-terminated, but
* don't let on-disk corruption crash the kernel