diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-21 12:30:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-21 12:30:07 -0700 |
| commit | 9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0 (patch) | |
| tree | 1270f24f89f10d832e879dd1352ef0209dd3aebe /fs/jfs/namei.c | |
| parent | a486b0af797e19ff79c6943cc8986111f2569fe8 (diff) | |
| parent | c7f2e1f0ac142a657a1de00d404e1c8345b20598 (diff) | |
| download | linux-9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0.tar.gz linux-9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0.tar.bz2 linux-9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0.zip | |
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/namei.c')
| -rw-r--r-- | fs/jfs/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index 4a3e9f39c21d..a9cf8e8675be 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c @@ -956,7 +956,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, */ if (ssize <= IDATASIZE) { - ip->i_op = &jfs_symlink_inode_operations; + ip->i_op = &jfs_fast_symlink_inode_operations; i_fastsymlink = JFS_IP(ip)->i_inline; memcpy(i_fastsymlink, name, ssize); @@ -978,7 +978,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry, else { jfs_info("jfs_symlink: allocate extent ip:0x%p", ip); - ip->i_op = &page_symlink_inode_operations; + ip->i_op = &jfs_symlink_inode_operations; ip->i_mapping->a_ops = &jfs_aops; /* |