From patchwork Fri Apr 29 15:13:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 741271 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3TFEcxh001391 for ; Fri, 29 Apr 2011 15:14:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752897Ab1D2POh (ORCPT ); Fri, 29 Apr 2011 11:14:37 -0400 Received: from sentry-two.sandia.gov ([132.175.109.14]:44041 "EHLO sentry-two.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754549Ab1D2POg (ORCPT ); Fri, 29 Apr 2011 11:14:36 -0400 X-WSS-ID: 0LKF6C9-0B-16M-02 X-M-MSG: Received: from interceptor1.sandia.gov (interceptor1.sandia.gov [132.175.109.5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sentry-two.sandia.gov (Postfix) with ESMTP id 1DC961895ED for ; Fri, 29 Apr 2011 09:14:33 -0600 (MDT) Received: from sentry.sandia.gov (sentry.sandia.gov [132.175.109.20]) by interceptor1.sandia.gov (RSA Interceptor) for ; Fri, 29 Apr 2011 09:09:32 -0600 Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Fri, 29 Apr 2011 09:14:09 -0600 X-Server-Uuid: AF72F651-81B1-4134-BA8C-A8E1A4E620FF Received: from localhost.localdomain (skynetcore1.sandia.gov [134.253.138.22]) by mailgate.sandia.gov (8.14.4/8.14.4) with ESMTP id p3TFDq69017855; Fri, 29 Apr 2011 09:13:52 -0600 From: "Jim Schutt" To: ceph-devel@vger.kernel.org cc: "Jim Schutt" Subject: [PATCH] hadoop: cleanups for libceph type update Date: Fri, 29 Apr 2011 09:13:59 -0600 Message-ID: <1304090039-14246-1-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.6.6 X-PMX-Version: 5.6.0.2009776, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.4.29.150316 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1300_1399 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS ' X-TMWD-Spam-Summary: TS=20110429151412; ID=1; SEV=2.3.1; DFV=B2011042915; IFV=NA; AIF=B2011042915; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230352E34444241443543342E303031303A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2011042915_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 61A40A4B2TS2494774-01-01 X-RSA-Inspected: yes X-RSA-Classifications: public X-RSA-Action: allow Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 29 Apr 2011 15:14:38 +0000 (UTC) Signed-off-by: Jim Schutt --- src/client/hadoop/CephFSInterface.cc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/hadoop/CephFSInterface.cc b/src/client/hadoop/CephFSInterface.cc index 38c9be9..dea082b 100644 --- a/src/client/hadoop/CephFSInterface.cc +++ b/src/client/hadoop/CephFSInterface.cc @@ -13,7 +13,7 @@ union ceph_mount_union_t { jlong cjlong; }; -static void set_struct ceph_mount_info(JNIEnv *env, jobject obj, struct ceph_mount_info *cmount) +static void set_ceph_mount_info(JNIEnv *env, jobject obj, struct ceph_mount_info *cmount) { jclass cls = env->GetObjectClass(obj); jfieldID fid = env->GetFieldID(cls, "cmount", "Ljava/lang/Long;"); @@ -105,7 +105,7 @@ JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1initi ceph_set_default_preferred_pg(cmount, ceph_get_local_osd(cmount)); } - set_ceph_mount_t(env, obj, cmount); + set_ceph_mount_info(env, obj, cmount); return true; } @@ -609,7 +609,7 @@ JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_fs_ceph_CephTalker_ceph_1kill_ if (!cmount) return true; ceph_shutdown(cmount); - set_ceph_mount_t(env, obj, NULL); + set_ceph_mount_info(env, obj, NULL); return true; }