Commit 44e8967d authored Dec 17, 2014 by Linus Torvalds

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 31c542a1 ("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>

parent 57666509

fs/ceph/super.h.rej

deleted100644 → 0

+0 −10

Original line number	Original line	Diff line number	Diff line
	--- 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;