Commit 44e8967d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: default avatarYan, Zheng <>
Cc: Sage Weil <>
Signed-off-by: default avatarLinus Torvalds <>
parent 57666509
--- 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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment