diff options
Diffstat (limited to 'fs/xfs/xfs_dir2_block.c')
-rw-r--r-- | fs/xfs/xfs_dir2_block.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c index 779a267b0a84..580d99cef9e7 100644 --- a/fs/xfs/xfs_dir2_block.c +++ b/fs/xfs/xfs_dir2_block.c | |||
@@ -24,12 +24,10 @@ | |||
24 | #include "xfs_sb.h" | 24 | #include "xfs_sb.h" |
25 | #include "xfs_ag.h" | 25 | #include "xfs_ag.h" |
26 | #include "xfs_dir2.h" | 26 | #include "xfs_dir2.h" |
27 | #include "xfs_dmapi.h" | ||
28 | #include "xfs_mount.h" | 27 | #include "xfs_mount.h" |
29 | #include "xfs_da_btree.h" | 28 | #include "xfs_da_btree.h" |
30 | #include "xfs_bmap_btree.h" | 29 | #include "xfs_bmap_btree.h" |
31 | #include "xfs_dir2_sf.h" | 30 | #include "xfs_dir2_sf.h" |
32 | #include "xfs_attr_sf.h" | ||
33 | #include "xfs_dinode.h" | 31 | #include "xfs_dinode.h" |
34 | #include "xfs_inode.h" | 32 | #include "xfs_inode.h" |
35 | #include "xfs_inode_item.h" | 33 | #include "xfs_inode_item.h" |
@@ -1073,10 +1071,10 @@ xfs_dir2_sf_to_block( | |||
1073 | */ | 1071 | */ |
1074 | 1072 | ||
1075 | buf_len = dp->i_df.if_bytes; | 1073 | buf_len = dp->i_df.if_bytes; |
1076 | buf = kmem_alloc(dp->i_df.if_bytes, KM_SLEEP); | 1074 | buf = kmem_alloc(buf_len, KM_SLEEP); |
1077 | 1075 | ||
1078 | memcpy(buf, sfp, dp->i_df.if_bytes); | 1076 | memcpy(buf, sfp, buf_len); |
1079 | xfs_idata_realloc(dp, -dp->i_df.if_bytes, XFS_DATA_FORK); | 1077 | xfs_idata_realloc(dp, -buf_len, XFS_DATA_FORK); |
1080 | dp->i_d.di_size = 0; | 1078 | dp->i_d.di_size = 0; |
1081 | xfs_trans_log_inode(tp, dp, XFS_ILOG_CORE); | 1079 | xfs_trans_log_inode(tp, dp, XFS_ILOG_CORE); |
1082 | /* | 1080 | /* |