← Back to branch summary

~james-page/ubuntu/vivid/ceph/0.93

« back to all changes in this revision

Viewing changes to src/rgw/rgw_op.cc

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-07-30 10:15:40 UTC
  • mfrom: (0.1.29 sid)
  • Revision ID: package-import@ubuntu.com-20140730101540-b7gsn9jqkye4a5ty
Tags: 0.80.5-1
* New upstream stable release:
  - d/p/firefly-post-release.patch: Dropped, no longer required.
  - d/lib{rados2,cephfs1}.symbols: Update with new symbols.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/rgw/rgw_op.cc
704
704
 
705
705
  do {
706
706
#define MAX_LIST_OBJS 100
707
 
    int r = store->list_objects(bucket, MAX_LIST_OBJS, obj_prefix, delim, marker,
 
707
    int r = store->list_objects(bucket, MAX_LIST_OBJS, obj_prefix, delim, marker, NULL,
708
708
                                objs, common_prefixes,
709
709
                                true, no_ns, true, &is_truncated, NULL);
710
710
    if (r < 0)
1102
1102
  if (ret < 0)
1103
1103
    return;
1104
1104
 
1105
 
  ret = store->list_objects(s->bucket, max, prefix, delimiter, marker, objs, common_prefixes,
 
1105
  string *pnext_marker = (delimiter.empty() ? NULL : &next_marker);
 
1106
 
 
1107
  ret = store->list_objects(s->bucket, max, prefix, delimiter, marker, pnext_marker, objs, common_prefixes,
1106
1108
                               !!(s->prot_flags & RGW_REST_SWIFT), no_ns, true, &is_truncated, NULL);
1107
1109
}
1108
1110
 
2993
2995
    }
2994
2996
  }
2995
2997
  marker_meta = marker.get_meta();
2996
 
  ret = store->list_objects(s->bucket, max_uploads, prefix, delimiter, marker_meta, objs, common_prefixes,
 
2998
  ret = store->list_objects(s->bucket, max_uploads, prefix, delimiter, marker_meta, NULL, objs, common_prefixes,
2997
2999
                               !!(s->prot_flags & RGW_REST_SWIFT), mp_ns, true, &is_truncated, &mp_filter);
2998
3000
  if (!objs.empty()) {
2999
3001
    vector<RGWObjEnt>::iterator iter;