Browse Source

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>
Linus Torvalds 10 years ago
parent
commit
44e8967d59
1 changed files with 0 additions and 10 deletions
  1. 0 10
      fs/ceph/super.h.rej

+ 0 - 10
fs/ceph/super.h.rej

@@ -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;