diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-21 03:50:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-21 03:50:39 -0400 |
commit | e04997b13a2c2fc93af970fe95fd29a74db113e8 (patch) | |
tree | a84ec3368edc3c2568a0d6acdfa0d0e50d8cacf7 /fs/udf/inode.c | |
parent | 6651ffc8e8bdd5fb4b7d1867c6cfebb4f309512c (diff) | |
parent | 05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 bb863fe579ac..8a3fbd177cab 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) | |||
1314 | break; | 1314 | break; |
1315 | case ICBTAG_FILE_TYPE_SYMLINK: | 1315 | case ICBTAG_FILE_TYPE_SYMLINK: |
1316 | inode->i_data.a_ops = &udf_symlink_aops; | 1316 | inode->i_data.a_ops = &udf_symlink_aops; |
1317 | inode->i_op = &page_symlink_inode_operations; | 1317 | inode->i_op = &udf_symlink_inode_operations; |
1318 | inode->i_mode = S_IFLNK | S_IRWXUGO; | 1318 | inode->i_mode = S_IFLNK | S_IRWXUGO; |
1319 | break; | 1319 | break; |
1320 | case ICBTAG_FILE_TYPE_MAIN: | 1320 | case ICBTAG_FILE_TYPE_MAIN: |