cleanup

diff --git a/src/kernel/dir.c b/src/kernel/dir.c
index 70a61276cfe22f2d79ab068668f72648119c279e..66c5d5c11338506fa8abfd0bf4261b9d433011e9 100644 (file)
--- a/src/kernel/dir.c
+++ b/src/kernel/dir.c
@@ -252,8 +252,10 @@ static struct dentry *ceph_dir_lookup(struct inode *dir, struct dentry *dentry,
        dout(5, "dir_lookup in dir %p dentry %p '%s'\n", dir, dentry, dentry->d_name.name);
 
        /* open(|create) intent? */
-       if (nd->flags & LOOKUP_OPEN) 
-               return ceph_lookup_open(dir, dentry, nd);
+       if (nd->flags & LOOKUP_OPEN) {
+               err = ceph_lookup_open(dir, dentry, nd);
+               return ERR_PTR(err);
+       }
 
        /* regular lookup */
        path = ceph_build_dentry_path(dentry, &pathlen);

diff --git a/src/kernel/super.h b/src/kernel/super.h
index e1406c638c88d77698794b3aa5ea1bf13f2bd11d..3859ec0b169540a120eafc9fc0a36567d352a15c 100644 (file)
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -16,8 +16,8 @@ extern int ceph_debug_msgr;
 extern int ceph_debug_mdsc;
 extern int ceph_debug_osdc;
 
-# define dout(x, args...) do { if (x <= (ceph_debug ? ceph_debug : DOUT_VAR)) printk(KERN_INFO "ceph_" DOUT_PREFIX args); } while (0);
-# define derr(x, args...) do { if (x <= (ceph_debug ? ceph_debug : DOUT_VAR)) printk(KERN_ERR "ceph_" DOUT_PREFIX args); } while (0);
+# define dout(x, args...) do { if (x <= (ceph_debug ? ceph_debug : DOUT_VAR)) printk(KERN_INFO "ceph_" DOUT_PREFIX args); } while (0)
+# define derr(x, args...) do { if (x <= (ceph_debug ? ceph_debug : DOUT_VAR)) printk(KERN_ERR "ceph_" DOUT_PREFIX args); } while (0)
 
 
 #define CEPH_SUPER_MAGIC 0xc364c0de  /* whatev */