diff mbox

hadoop: cleanups for libceph type update

Message ID 1304090039-14246-1-git-send-email-jaschut@sandia.gov (mailing list archive)
State New, archived
Headers show

Commit Message

Jim Schutt April 29, 2011, 3:13 p.m. UTC
Signed-off-by: Jim Schutt <jaschut@sandia.gov>
---
 src/client/hadoop/CephFSInterface.cc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Comments

Sage Weil April 29, 2011, 3:51 p.m. UTC | #1
Applied, thanks!

On Fri, 29 Apr 2011, Jim Schutt wrote:

> 
> Signed-off-by: Jim Schutt <jaschut@sandia.gov>
> ---
>  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;
>  }
>  
> -- 
> 1.6.6
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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;
 }