git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
include
/
linux
/
ceph
/
osd_client.h
diff --git
a/include/linux/ceph/osd_client.h
b/include/linux/ceph/osd_client.h
index
f88eacb
..
7c05ac2
100644
(file)
--- a/
include/linux/ceph/osd_client.h
+++ b/
include/linux/ceph/osd_client.h
@@
-10,6
+10,12
@@
#include "osdmap.h"
#include "messenger.h"
#include "osdmap.h"
#include "messenger.h"
+/*
+ * Maximum object name size
+ * (must be at least as big as RBD_MAX_MD_NAME_LEN -- currently 100)
+ */
+#define MAX_OBJ_NAME_SIZE 100
+
struct ceph_msg;
struct ceph_snap_context;
struct ceph_osd_request;
struct ceph_msg;
struct ceph_snap_context;
struct ceph_osd_request;
@@
-75,7
+81,7
@@
struct ceph_osd_request {
struct inode *r_inode; /* for use by callbacks */
void *r_priv; /* ditto */
struct inode *r_inode; /* for use by callbacks */
void *r_priv; /* ditto */
- char r_oid[
40
]; /* object name */
+ char r_oid[
MAX_OBJ_NAME_SIZE
]; /* object name */
int r_oid_len;
unsigned long r_stamp; /* send OR check time */
int r_oid_len;
unsigned long r_stamp; /* send OR check time */