From b1bc3345ae4b522ecf288d596635e70ff5b48aff Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Wed, 14 Nov 2012 09:38:20 -0600
Subject: [PATCH] --- yaml --- r: 359599 b: refs/heads/master c:
 2b5fc648af5eec2f4fe984cb6b926214e02c5cf4 h: refs/heads/master i:   359597:
 d68ec4e4b41e7984dbaae6c932b60cd4097d1144   359595:
 6d067a45828b61a2ff81d3b08a6769a6707581a3   359591:
 9b97fd0d9c9ffef56cdbaba77efdd5217b83ed78   359583:
 c20c9ec871b04788d6f396b0cdb94d7f5a761fc4 v: v3

---
 [refs]                                | 2 +-
 trunk/include/linux/ceph/osd_client.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c5447ae5e1e4..eb8c27903a3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30573d680355ca0de4db2113b9080cd078ac726f
+refs/heads/master: 2b5fc648af5eec2f4fe984cb6b926214e02c5cf4
diff --git a/trunk/include/linux/ceph/osd_client.h b/trunk/include/linux/ceph/osd_client.h
index 2b04d054e09d..69287ccfe68a 100644
--- a/trunk/include/linux/ceph/osd_client.h
+++ b/trunk/include/linux/ceph/osd_client.h
@@ -157,7 +157,6 @@ struct ceph_osd_client {
 
 struct ceph_osd_req_op {
 	u16 op;           /* CEPH_OSD_OP_* */
-	u32 flags;        /* CEPH_OSD_FLAG_* */
 	union {
 		struct {
 			u64 offset, length;