From e97424e853ccf49ef0006e5315eff8e6c6180e89 Mon Sep 17 00:00:00 2001
From: tappro <tappro>
Date: Fri, 13 Oct 2006 12:32:13 +0000
Subject: [PATCH] - fix missed result code due to wrong GOTO usage

---
 lustre/llite/dir.c        | 2 +-
 lustre/llite/llite_lib.c  | 2 +-
 lustre/lmv/lmv_obd.c      | 4 ++--
 lustre/lvfs/fsfilt_ext3.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index 9d15b41..6a64959 100644
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -1031,7 +1031,7 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
                         break;
                 default:
                         CERROR("unsupported quotactl op: %#x\n", cmd);
-                        GOTO(out_quotactl, -ENOTTY);
+                        GOTO(out_quotactl, rc = -ENOTTY);
                 }
 
                 QCTL_COPY(oqctl, qctl);
diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 1f0cbcd..41bb1be 100644
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -368,7 +368,7 @@ static int client_common_fill_super(struct super_block *sb,
                                                        ll_async_page_slab_size,
                                                        0, 0, NULL, NULL);
                 if (!ll_async_page_slab)
-                        GOTO(out_dt, -ENOMEM);
+                        GOTO(out_dt, err = -ENOMEM);
         }
 
         /* init FIDs framework */
diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index eb51f28..c68258b 100644
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -1935,7 +1935,7 @@ static int lmv_reset_hash_seg_end(struct lmv_obd *lmv, struct lmv_obj *obj,
         rid = obj->lo_inodes[index].li_fid;
         tgt_exp = lmv_get_export(lmv, &rid);
         if (IS_ERR(tgt_exp))
-                GOTO(cleanup, PTR_ERR(tgt_exp));
+                GOTO(cleanup, rc = PTR_ERR(tgt_exp));
 
         /* Alloc a page to get next segment hash,
          * FIXME: should we try to page from cache first */
@@ -2006,7 +2006,7 @@ static int lmv_readpage(struct obd_export *exp, const struct lu_fid *fid,
 
         tgt_exp = lmv_get_export(lmv, &rid);
         if (IS_ERR(tgt_exp))
-                GOTO(cleanup, PTR_ERR(tgt_exp));
+                GOTO(cleanup, rc = PTR_ERR(tgt_exp));
 
         rc = md_readpage(tgt_exp, &rid, oc, offset, page, request);
         if (rc)
diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index 760bb78..2cc74ab 100644
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -1828,7 +1828,7 @@ static int fsfilt_ext3_quotacheck(struct super_block *sb,
                 bitmap_bh = read_inode_bitmap(sb, group);
                 if (!bitmap_bh) {
                         CERROR("read_inode_bitmap group %d failed", group);
-                        GOTO(out, -EIO);
+                        GOTO(out, rc = -EIO);
                 }
 
                 for (i = 0; i < sbi->s_inodes_per_group; i++, ino++) {
-- 
1.8.3.1