Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=20226 rename osd to osd-ldiskfs
[fs/lustre-release.git]
/
lustre
/
mdd
/
mdd_orphans.c
diff --git
a/lustre/mdd/mdd_orphans.c
b/lustre/mdd/mdd_orphans.c
index
c9dff6d
..
326e0b0
100644
(file)
--- a/
lustre/mdd/mdd_orphans.c
+++ b/
lustre/mdd/mdd_orphans.c
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-70,7
+70,8
@@
static struct dt_key* orph_key_fill(const struct lu_env *env,
int rc;
LASSERT(key);
int rc;
LASSERT(key);
- rc = snprintf(key, NAME_MAX + 1, ORPHAN_FILE_NAME_FORMAT, fid_seq(lf),
+ rc = snprintf(key, NAME_MAX + 1, ORPHAN_FILE_NAME_FORMAT,
+ (long long unsigned int)fid_seq(lf),
fid_oid(lf), fid_ver(lf), op);
if (rc > 0)
return (struct dt_key*) key;
fid_oid(lf), fid_ver(lf), op);
if (rc > 0)
return (struct dt_key*) key;
@@
-98,14
+99,15
@@
static int orphan_key_to_fid(char *key, struct lu_fid *lf)
int rc = 0;
unsigned int op;
int rc = 0;
unsigned int op;
- rc = sscanf(key, ORPHAN_FILE_NAME_FORMAT, &lf->f_seq, &lf->f_oid,
+ rc = sscanf(key, ORPHAN_FILE_NAME_FORMAT,
+ (long long unsigned int *)&lf->f_seq, &lf->f_oid,
&lf->f_ver, &op);
if (rc == 4)
return 0;
/* build igif */
rc = sscanf(key, ORPHAN_FILE_NAME_FORMAT_18,
&lf->f_ver, &op);
if (rc == 4)
return 0;
/* build igif */
rc = sscanf(key, ORPHAN_FILE_NAME_FORMAT_18,
- &lf->f_seq, &lf->f_oid);
+
(long long unsigned int *)
&lf->f_seq, &lf->f_oid);
if (rc == 2) {
lf->f_ver = 0;
return 0;
if (rc == 2) {
lf->f_ver = 0;
return 0;