diff options
Diffstat (limited to 'fs/ocfs2/extent_map.c')
-rw-r--r-- | fs/ocfs2/extent_map.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index 70b5863a2d64..f487aa343442 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c | |||
@@ -832,7 +832,7 @@ out: | |||
832 | return ret; | 832 | return ret; |
833 | } | 833 | } |
834 | 834 | ||
835 | int ocfs2_seek_data_hole_offset(struct file *file, loff_t *offset, int origin) | 835 | int ocfs2_seek_data_hole_offset(struct file *file, loff_t *offset, int whence) |
836 | { | 836 | { |
837 | struct inode *inode = file->f_mapping->host; | 837 | struct inode *inode = file->f_mapping->host; |
838 | int ret; | 838 | int ret; |
@@ -843,7 +843,7 @@ int ocfs2_seek_data_hole_offset(struct file *file, loff_t *offset, int origin) | |||
843 | struct buffer_head *di_bh = NULL; | 843 | struct buffer_head *di_bh = NULL; |
844 | struct ocfs2_extent_rec rec; | 844 | struct ocfs2_extent_rec rec; |
845 | 845 | ||
846 | BUG_ON(origin != SEEK_DATA && origin != SEEK_HOLE); | 846 | BUG_ON(whence != SEEK_DATA && whence != SEEK_HOLE); |
847 | 847 | ||
848 | ret = ocfs2_inode_lock(inode, &di_bh, 0); | 848 | ret = ocfs2_inode_lock(inode, &di_bh, 0); |
849 | if (ret) { | 849 | if (ret) { |
@@ -859,7 +859,7 @@ int ocfs2_seek_data_hole_offset(struct file *file, loff_t *offset, int origin) | |||
859 | } | 859 | } |
860 | 860 | ||
861 | if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) { | 861 | if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) { |
862 | if (origin == SEEK_HOLE) | 862 | if (whence == SEEK_HOLE) |
863 | *offset = inode->i_size; | 863 | *offset = inode->i_size; |
864 | goto out_unlock; | 864 | goto out_unlock; |
865 | } | 865 | } |
@@ -888,8 +888,8 @@ int ocfs2_seek_data_hole_offset(struct file *file, loff_t *offset, int origin) | |||
888 | is_data = (rec.e_flags & OCFS2_EXT_UNWRITTEN) ? 0 : 1; | 888 | is_data = (rec.e_flags & OCFS2_EXT_UNWRITTEN) ? 0 : 1; |
889 | } | 889 | } |
890 | 890 | ||
891 | if ((!is_data && origin == SEEK_HOLE) || | 891 | if ((!is_data && whence == SEEK_HOLE) || |
892 | (is_data && origin == SEEK_DATA)) { | 892 | (is_data && whence == SEEK_DATA)) { |
893 | if (extoff > *offset) | 893 | if (extoff > *offset) |
894 | *offset = extoff; | 894 | *offset = extoff; |
895 | goto out_unlock; | 895 | goto out_unlock; |
@@ -899,7 +899,7 @@ int ocfs2_seek_data_hole_offset(struct file *file, loff_t *offset, int origin) | |||
899 | cpos += clen; | 899 | cpos += clen; |
900 | } | 900 | } |
901 | 901 | ||
902 | if (origin == SEEK_HOLE) { | 902 | if (whence == SEEK_HOLE) { |
903 | extoff = cpos; | 903 | extoff = cpos; |
904 | extoff <<= cs_bits; | 904 | extoff <<= cs_bits; |
905 | extlen = clen; | 905 | extlen = clen; |