Commit 00251a16 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Bob Peterson

gfs2: Minor clarification to __gfs2_punch_hole

Rename end_off to end_len to make the code less confusing.
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent 9e1a9ecd
...@@ -2154,11 +2154,11 @@ int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length) ...@@ -2154,11 +2154,11 @@ int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length)
if (error) if (error)
goto out; goto out;
} else { } else {
unsigned int start_off, end_off, blocksize; unsigned int start_off, end_len, blocksize;
blocksize = i_blocksize(inode); blocksize = i_blocksize(inode);
start_off = offset & (blocksize - 1); start_off = offset & (blocksize - 1);
end_off = (offset + length) & (blocksize - 1); end_len = (offset + length) & (blocksize - 1);
if (start_off) { if (start_off) {
unsigned int len = length; unsigned int len = length;
if (length > blocksize - start_off) if (length > blocksize - start_off)
...@@ -2167,11 +2167,11 @@ int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length) ...@@ -2167,11 +2167,11 @@ int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length)
if (error) if (error)
goto out; goto out;
if (start_off + length < blocksize) if (start_off + length < blocksize)
end_off = 0; end_len = 0;
} }
if (end_off) { if (end_len) {
error = gfs2_block_zero_range(inode, error = gfs2_block_zero_range(inode,
offset + length - end_off, end_off); offset + length - end_len, end_len);
if (error) if (error)
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment