History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull Ceph changes from Sage Weil: "On the RBD side, there is a conversion to blk-mq from Christoph, several long-standing bug fixes from Ilya, and some cleanup from Rickard Strandqvist. On the CephFS side there is a long list of fixes from Zheng, including improved session handling, a few IO path fixes, some dcache management correctness fixes, and several blocking while !TASK_RUNNING fixes. The core code gets a few cleanups and Chaitanya has added support for TCP_NODELAY (which has been used on the server side for ages but we somehow missed on the kernel client). There is also an update to MAINTAINERS to fix up some email addresses and reflect that Ilya and Zheng are doing most of the maintenance for RBD and CephFS these days. Do not be surprised to see a pull request come from one of them in the future if I am unavailable for some reason" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (27 commits) MAINTAINERS: update Ceph and RBD maintainers libceph: kfree() in put_osd() shouldn't depend on authorizer libceph: fix double __remove_osd() problem rbd: convert to blk-mq ceph: return error for traceless reply race ceph: fix dentry leaks ceph: re-send requests when MDS enters reconnecting stage ceph: show nocephx_require_signatures and notcp_nodelay options libceph: tcp_nodelay support rbd: do not treat standalone as flatten ceph: fix atomic_open snapdir ceph: properly mark empty directory as complete client: include kernel version in client metadata ceph: provide seperate {inode,file}_operations for snapdir ceph: fix request time stamp encoding ceph: fix reading inline data when i_size > PAGE_SIZE ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_close_sessions) ceph: avoid block operation when !TASK_RUNNING (ceph_get_caps) ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_sync) rbd: fix error paths in rbd_dev_refresh() ...

Linus Torvalds committed 11 years ago

Commit 4533f6e2 parents 89d3fa4 0f5417c23 files · +444 −488Browse files

Showing the changes to include (4 of 23 files). Show all

Unified · Split

4 files
  1. include/linux/ceph/ceph_fs.h +1 −36
  2. include/linux/ceph/libceph.h +2 −1
  3. include/linux/ceph/messenger.h +3 −1
  4. include/linux/ceph/mon_client.h +1 −8
include/linux/ceph/ceph_fs.h+1−36
@@ -158,17 +158,6 @@ enum { · 157 unmodified lines
158158 };
159159
160160
161−/* pool operations */
162−enum {
163− POOL_OP_CREATE = 0x01,
164− POOL_OP_DELETE = 0x02,
165− POOL_OP_AUID_CHANGE = 0x03,
166− POOL_OP_CREATE_SNAP = 0x11,
167− POOL_OP_DELETE_SNAP = 0x12,
168− POOL_OP_CREATE_UNMANAGED_SNAP = 0x21,
169− POOL_OP_DELETE_UNMANAGED_SNAP = 0x22,
170−};
171−
172161 struct ceph_mon_request_header {
173162 __le64 have_version;
174163 __le16 session_mon;
@@ -191,31 +180,6 @@ struct ceph_mon_statfs_reply { · 16 unmodified lines
191180 struct ceph_statfs st;
192181 } __attribute__ ((packed));
193182
194−const char *ceph_pool_op_name(int op);
195−
196−struct ceph_mon_poolop {
197− struct ceph_mon_request_header monhdr;
198− struct ceph_fsid fsid;
199− __le32 pool;
200− __le32 op;
201− __le64 auid;
202− __le64 snapid;
203− __le32 name_len;
204−} __attribute__ ((packed));
205−
206−struct ceph_mon_poolop_reply {
207− struct ceph_mon_request_header monhdr;
208− struct ceph_fsid fsid;
209− __le32 reply_code;
210− __le32 epoch;
211− char has_data;
212− char data[0];
213−} __attribute__ ((packed));
214−
215−struct ceph_mon_unmanaged_snap {
216− __le64 snapid;
217−} __attribute__ ((packed));
218−
219183 struct ceph_osd_getmap {
220184 struct ceph_mon_request_header monhdr;
221185 struct ceph_fsid fsid;
@@ -307,6 +271,7 @@ enum { · 85 unmodified lines
307271 CEPH_SESSION_RECALL_STATE,
308272 CEPH_SESSION_FLUSHMSG,
309273 CEPH_SESSION_FLUSHMSG_ACK,
274+ CEPH_SESSION_FORCE_RO,
310275 };
311276
312277 extern const char *ceph_session_op_name(int op);
include/linux/ceph/libceph.h+2−1
@@ -30,8 +30,9 @@ · 29 unmodified lines
3030 #define CEPH_OPT_MYIP (1<<2) /* specified my ip */
3131 #define CEPH_OPT_NOCRC (1<<3) /* no data crc on writes */
3232 #define CEPH_OPT_NOMSGAUTH (1<<4) /* not require cephx message signature */
33+#define CEPH_OPT_TCP_NODELAY (1<<5) /* TCP_NODELAY on TCP sockets */
3334
34−#define CEPH_OPT_DEFAULT (0)
35+#define CEPH_OPT_DEFAULT (CEPH_OPT_TCP_NODELAY)
3536
3637 #define ceph_set_opt(client, opt) \
3738 (client)->options->flags |= CEPH_OPT_##opt;
include/linux/ceph/messenger.h+3−1
@@ -57,6 +57,7 @@ struct ceph_messenger { · 56 unmodified lines
5757
5858 atomic_t stopping;
5959 bool nocrc;
60+ bool tcp_nodelay;
6061
6162 /*
6263 * the global_seq counts connections i (attempt to) initiate
@@ -264,7 +265,8 @@ extern void ceph_messenger_init(struct ceph_messenger *msgr, · 201 unmodified lines
264265 struct ceph_entity_addr *myaddr,
265266 u64 supported_features,
266267 u64 required_features,
267− bool nocrc);
268+ bool nocrc,
269+ bool tcp_nodelay);
268270
269271 extern void ceph_con_init(struct ceph_connection *con, void *private,
270272 const struct ceph_connection_operations *ops,
include/linux/ceph/mon_client.h+1−8
@@ -40,7 +40,7 @@ struct ceph_mon_request { · 39 unmodified lines
4040 };
4141
4242 /*
43− * ceph_mon_generic_request is being used for the statfs, poolop and
43+ * ceph_mon_generic_request is being used for the statfs and
4444 * mon_get_version requests which are being done a bit differently
4545 * because we need to get data back to the caller
4646 */
@@ -50,7 +50,6 @@ struct ceph_mon_generic_request { · 3 unmodified lines
5050 struct rb_node node;
5151 int result;
5252 void *buf;
53− int buf_len;
5453 struct completion completion;
5554 struct ceph_msg *request; /* original request */
5655 struct ceph_msg *reply; /* and reply */
@@ -117,10 +116,4 @@ extern int ceph_monc_open_session(struct ceph_mon_client *monc); · 60 unmodified lines
117116
118117 extern int ceph_monc_validate_auth(struct ceph_mon_client *monc);
119118
120−extern int ceph_monc_create_snapid(struct ceph_mon_client *monc,
121− u32 pool, u64 *snapid);
122−
123−extern int ceph_monc_delete_snapid(struct ceph_mon_client *monc,
124− u32 pool, u64 snapid);
125−
126119 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t