From: anserper <anserper>
Date: Wed, 25 Feb 2009 22:54:51 +0000 (+0000)
Subject: b=14929
X-Git-Tag: GIT_EPOCH_B1_6~2^5~161
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=5ff03a8042a306b854fe23958f7d85e7a10fb748;p=fs%2Flustre-release.git

b=14929
i=Alexey Lyashkov
i=Johann Lombardi
 remove duplicate code in filter_get_info and add pop_ctxt into error path
---

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 1a5dfab..329e513 100644
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -3619,14 +3619,10 @@ static int filter_get_info(struct obd_export *exp, __u32 keylen,
                 push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
                 rc = fsfilt_iocontrol(obd, dentry->d_inode, NULL,
                                       EXT3_IOC_FIEMAP, (long)fiemap);
-                if (rc) {
-                        f_dput(dentry);
-                        RETURN(rc);
-                }
                 pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
 
                 f_dput(dentry);
-                RETURN(0);
+                RETURN(rc);
         }
 
         CDEBUG(D_IOCTL, "invalid key\n");