summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-18 05:47:01 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-18 05:47:01 +0300
commit44e8967d591686463e84a88b46b03beba3ab49fb (patch)
treeb2fc962f8d37b6dd1e40f471550dd7801f86b1ac
parent57666509b70030a9483d13222bfec8eec5db07df (diff)
downloadlinux-44e8967d591686463e84a88b46b03beba3ab49fb.tar.xz
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>
-rw-r--r--fs/ceph/super.h.rej10
1 files changed, 0 insertions, 10 deletions
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;