diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-04-21 07:47:00 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-04-21 07:47:05 (GMT) |
commit | ac0053fd51d2bac09a7d4b4a59f6dac863bd4373 (patch) | |
tree | 00c32e14428853f352fa3828d0131653ad6a7c69 /fs/udf/inode.c | |
parent | b15c7b1cee119999e9eafcd602d24a595e77adac (diff) | |
parent | 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff) | |
download | linux-fsl-qoriq-ac0053fd51d2bac09a7d4b4a59f6dac863bd4373.tar.xz |
Merge commit 'v2.6.34-rc5' into tracing/core
Merge reason: pick up latest -rc's.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/udf/inode.c')
-rw-r--r-- | fs/udf/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index bb863fe..8a3fbd1 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1314,7 +1314,7 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) break; case ICBTAG_FILE_TYPE_SYMLINK: inode->i_data.a_ops = &udf_symlink_aops; - inode->i_op = &page_symlink_inode_operations; + inode->i_op = &udf_symlink_inode_operations; inode->i_mode = S_IFLNK | S_IRWXUGO; break; case ICBTAG_FILE_TYPE_MAIN: |