From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Dec 2014 02:47:01 +0000 (-0800)
Subject: Ceph: remove left-over reject file
X-Git-Tag: firefly_0821_release~176^2~2638
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=44e8967d591686463e84a88b46b03beba3ab49fb;p=firefly-linux-kernel-4.4.55.git

Ceph: remove left-over reject file

Neither Sage nor I noticed that Zheng Yan had mistakenly committed
fs/ceph/super.h.rej as part of commit 31c542a199d7 ("ceph: add inline
data to pagecache").

Remove it.

Requested-by: Yan, Zheng <ukernel@gmail.com>
Cc: Sage Weil <sweil@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/ceph/super.h.rej b/fs/ceph/super.h.rej
deleted file mode 100644
index 88fe3dfadb29..000000000000
--- a/fs/ceph/super.h.rej
+++ /dev/null
@@ -1,10 +0,0 @@
---- fs/ceph/super.h
-+++ fs/ceph/super.h
-@@ -254,6 +255,7 @@
-	spinlock_t i_ceph_lock;
-
-	u64 i_version;
-+	u64 i_inline_version;
-	u32 i_time_warp_seq;
-
-	unsigned i_ceph_flags;