RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 00:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

some x86 cleanups

Browse Source
This commit is contained in:
Sage Weil 2008-01-25 21:46:23 -08:00
parent e8ee2f5111
commit 7a2f41330a
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kernel/file.c
View File

@ -227,7 +227,7 @@ ssize_t ceph_silly_write(struct file *file, const char __user * data,
int ret = 0;
int did = 0;
dout(10, "silly_write on file %p %lld~%lu\n", file, *offset, count);
dout(10, "silly_write on file %p %lld~%u\n", file, *offset, (unsigned)count);
/* ignore caps, for now. */
/* this is an ugly hack */
@ -240,7 +240,7 @@ ssize_t ceph_silly_write(struct file *file, const char __user * data,
*offset += ret;
data += ret;
count -= ret;
dout(10, "did %d bytes, ret now %d, %lu left\n", did, ret, count);
dout(10, "did %d bytes, ret now %d, %u left\n", did, ret, (unsigned)count);
} else if (did)
break;
else

5
src/kernel/inode.c
View File

@ -14,7 +14,7 @@ int ceph_inode_debug = 50;
const struct inode_operations ceph_symlink_iops;
int ceph_get_inode(struct super_block *sb, ino_t ino, struct inode **pinode)
int ceph_get_inode(struct super_block *sb, __u64 ino, struct inode **pinode)
{
struct ceph_inode_info *ci;
@ -29,8 +29,9 @@ int ceph_get_inode(struct super_block *sb, ino_t ino, struct inode **pinode)
ci = ceph_inode(*pinode);
ceph_set_ino(*pinode, ino);
ci->i_hashval = ino;
ci->i_hashval = (*pinode)->i_ino;
dout(30, "get_inode on %lu=%llx got %p\n", (*pinode)->i_ino, ino, *pinode);
return 0;
}

18
src/kernel/super.c
View File

@ -114,7 +114,6 @@ static struct inode *ceph_alloc_inode(struct super_block *sb)
ci->i_caps = ci->i_caps_static;
atomic_set(&ci->i_cap_count, 0);
dout(30, "ceph_alloc_inode sb=%p\n", sb);
for (i=0; i<4; i++)
ci->i_nr_by_mode[i] = 0;
ci->i_cap_wanted = 0;
@ -132,7 +131,7 @@ static void ceph_destroy_inode(struct inode *inode)
{
struct ceph_inode_info *ci = ceph_inode(inode);
dout(30, "ceph_destroy_inode %p ino %lu=%llx\n", inode,
dout(30, "destroy_inode %p ino %lu=%llx\n", inode,
inode->i_ino, ceph_ino(inode));
if (ci->i_caps != ci->i_caps_static)
@ -143,9 +142,10 @@ static void ceph_destroy_inode(struct inode *inode)
kmem_cache_free(ceph_inode_cachep, ci);
}
static void init_once(void *foo, struct kmem_cache *cachep, unsigned long flags)
static void init_once(struct kmem_cache *cachep, void *foo)
{
struct ceph_inode_info *ci = foo;
dout(10, "init_once on %p\n", foo);
inode_init_once(&ci->vfs_inode);
}
@ -251,9 +251,9 @@ bad:
static int parse_mount_args(int flags, char *options, const char *dev_name, struct ceph_mount_args *args)
{
char *c;
int len;
int len, err;
substring_t argstr[MAX_OPT_ARGS];
dout(15, "parse_mount_args dev_name '%s'\n", dev_name);
memset(args, 0, sizeof(*args));
@ -269,7 +269,8 @@ static int parse_mount_args(int flags, char *options, const char *dev_name, stru
/* get mon ip */
/* er, just one for now. later, comma-separate... */
len = c - dev_name;
parse_ip(dev_name, len, &args->mon_addr[0]);
if ((err = parse_ip(dev_name, len, &args->mon_addr[0])) < 0)
return err;
args->mon_addr[0].ipaddr.sin_family = AF_INET;
args->mon_addr[0].ipaddr.sin_port = htons(CEPH_MON_PORT);
args->mon_addr[0].erank = 0;
@ -327,7 +328,10 @@ static int parse_mount_args(int flags, char *options, const char *dev_name, stru
args->my_addr.ipaddr.sin_port = htons(intval);
break;
case Opt_ip:
parse_ip(argstr[0].from, argstr[0].to-argstr[0].from, &args->my_addr);
if ((err = parse_ip(argstr[0].from,
argstr[0].to-argstr[0].from,
&args->my_addr)) < 0)
return err;
break;
default:
derr(1, "parse_mount_args bad token %d\n", token);

2
src/kernel/super.h
View File

@ -248,7 +248,7 @@ extern int ceph_mount(struct ceph_client *client, struct ceph_mount_args *args,
/* inode.c */
extern int ceph_get_inode(struct super_block *sb, ino_t ino, struct inode **pinode);
extern int ceph_get_inode(struct super_block *sb, u64 ino, struct inode **pinode);
extern int ceph_fill_inode(struct inode *inode, struct ceph_mds_reply_inode *info);
extern struct ceph_inode_cap *ceph_find_cap(struct inode *inode, int want);
extern struct ceph_inode_cap *ceph_add_cap(struct inode *inode, struct ceph_mds_session *session, u32 cap, u32 seq);