This patch cleans up an error variable which was initialized to 0 and
then never changed, and a 'fail' section which could be replaced by a
return. It also removes the 'out' label which was only referenced from
the dead if-statement in the 'fail' section.
Signed-off-by: Andrew Price <anpr...@redhat.com>
---
gfs2/libgfs2/gfs1.c | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/gfs2/libgfs2/gfs1.c b/gfs2/libgfs2/gfs1.c
index 2bd5282..4549959 100644
--- a/gfs2/libgfs2/gfs1.c
+++ b/gfs2/libgfs2/gfs1.c
@@ -181,11 +181,9 @@ int gfs1_writei(struct gfs2_inode *ip, char *buf, uint64_t
offset,
int journaled = fs_is_jdata(ip);
const uint64_t start = offset;
int copied = 0;
- int error = 0;
if (!size)
- goto fail; /* Not really an error */
-
+ return 0;
if (!ip->i_di.di_height && /* stuffed */
((start + size) > (sdp->bsize - sizeof(struct gfs_dinode))))
@@ -243,7 +241,6 @@ int gfs1_writei(struct gfs2_inode *ip, char *buf, uint64_t
offset,
offset = (journaled) ? sizeof(struct gfs2_meta_header) : 0;
}
- out:
if (ip->i_di.di_size < start + copied) {
bmodified(ip->i_bh);
ip->i_di.di_size = start + copied;
@@ -253,12 +250,6 @@ int gfs1_writei(struct gfs2_inode *ip, char *buf, uint64_t
offset,
gfs2_dinode_out(&ip->i_di, ip->i_bh);
return copied;
-
- fail:
- if (copied)
- goto out;
-
- return error;
}
/* ------------------------------------------------------------------------ */
--
1.7.6
