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
LU-2240 mds: Assign special fid sequence to root.
[fs/lustre-release.git]
/
lustre
/
osd-ldiskfs
/
osd_oi.c
diff --git
a/lustre/osd-ldiskfs/osd_oi.c
b/lustre/osd-ldiskfs/osd_oi.c
index
8f9dbc4
..
118359a
100644
(file)
--- a/
lustre/osd-ldiskfs/osd_oi.c
+++ b/
lustre/osd-ldiskfs/osd_oi.c
@@
-467,7
+467,7
@@
int fid_is_on_ost(struct osd_thread_info *info, struct osd_device *osd,
int rc;
ENTRY;
int rc;
ENTRY;
- if (unlikely(fid_
seq(fid) == FID_SEQ_LOCAL_FILE
))
+ if (unlikely(fid_
is_local_file(fid) || fid_is_igif(fid)
))
RETURN(0);
if (fid_is_idif(fid) || fid_is_last_id(fid))
RETURN(0);
if (fid_is_idif(fid) || fid_is_last_id(fid))
@@
-515,8
+515,6
@@
int osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd,
return osd_obj_spec_lookup(info, osd, fid, id);
if ((check_fld && fid_is_on_ost(info, osd, fid)) || fid_is_llog(fid))
return osd_obj_spec_lookup(info, osd, fid, id);
if ((check_fld && fid_is_on_ost(info, osd, fid)) || fid_is_llog(fid))
- /* old OSD obj id */
- /* FIXME: actually for all of the OST object */
return osd_obj_map_lookup(info, osd, fid, id);
if (fid_is_fs_root(fid)) {
return osd_obj_map_lookup(info, osd, fid, id);
if (fid_is_fs_root(fid)) {