kclient: create -> mknod sets S_IFREG. debug mode.

diff --git a/src/kernel/dir.c b/src/kernel/dir.c
index 23d017ce60e1abfb61b2cad6343eadc711a88aec..7343e5a764a281d5746c49b7358f23d66d274c8d 100644 (file)
--- a/src/kernel/dir.c
+++ b/src/kernel/dir.c
@@ -318,7 +318,7 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,
        int pathlen;
        int err;
 
-       dout(5, "dir_mknod in dir %p dentry %p mode %d rdev %d\n",
+       dout(5, "dir_mknod in dir %p dentry %p mode 0%o rdev %d\n",
             dir, dentry, mode, rdev);
        path = ceph_build_dentry_path(dentry, &pathlen);
        if (IS_ERR(path))
@@ -356,7 +356,7 @@ static int ceph_create(struct inode *dir, struct dentry *dentry, int mode,
        }
 
        /* fall back to mknod */
-       return ceph_mknod(dir, dentry, mode, 0);
+       return ceph_mknod(dir, dentry, (mode & ~S_IFMT) | S_IFREG, 0);
 }
 
 static int ceph_symlink(struct inode *dir, struct dentry *dentry,
@@ -399,7 +399,7 @@ static int ceph_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        int pathlen;
        int err;
 
-       dout(5, "dir_mkdir in dir %p dentry %p mode %d\n", dir, dentry, mode);
+       dout(5, "dir_mkdir in dir %p dentry %p mode 0%o\n", dir, dentry, mode);
        path = ceph_build_dentry_path(dentry, &pathlen);
        if (IS_ERR(path))
                return PTR_ERR(path);

diff --git a/src/kernel/file.c b/src/kernel/file.c
index 03641da6331a53dc166cbacbb157e85751325d8a..b9d3df06fa355461863a2148be7af181ecb29caa 100644 (file)
--- a/src/kernel/file.c
+++ b/src/kernel/file.c
@@ -103,7 +103,7 @@ int ceph_open(struct inode *inode, struct file *file)
                return ceph_init_file(inode, file, fmode);
        }
        spin_unlock(&inode->i_lock);
-       dout(10, "open mode %d, don't have caps %d\n", fmode, wantcaps);
+       dout(10, "open fmode %d, don't have caps %d\n", fmode, wantcaps);
 
        req = prepare_open_request(inode->i_sb, dentry, flags, 0);
        if (IS_ERR(req))

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 3f0c660dce30d0a86dd3c1a01c406f19670d35b4..c40a4050a419d97d3867a5d1f114dfa45fb26d2e 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -78,7 +78,7 @@ int ceph_fill_inode(struct inode *inode, struct ceph_mds_reply_inode *info)
        u64 blocks = (size + (1<<9) - 1) >> 9;
        u64 time_warp_seq;
 
-       dout(30, "fill_inode %p ino %llx by %d.%d sz=%llu mode %o nlink %d\n",
+       dout(30, "fill_inode %p ino %llx by %d.%d sz=%llu mode 0%o nlink %d\n",
             inode, info->ino, inode->i_uid, inode->i_gid,
             inode->i_size, inode->i_mode, inode->i_nlink);
 
@@ -1556,7 +1556,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
                dout(10, "setattr: %p gid %d -> %d\n", inode,
                     inode->i_uid, attr->ia_uid);
        if (ia_valid & ATTR_MODE)
-               dout(10, "setattr: %p mode %o -> %o\n", inode, inode->i_mode,
+               dout(10, "setattr: %p mode 0%o -> 0%o\n", inode, inode->i_mode,
                     attr->ia_mode);
        if (ia_valid & ATTR_SIZE)
                dout(10, "setattr: %p size %lld -> %lld\n", inode,