diff options
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/super.h.rej | 10 |
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 @@ | |||
| 1 | --- fs/ceph/super.h | ||
| 2 | +++ fs/ceph/super.h | ||
| 3 | @@ -254,6 +255,7 @@ | ||
| 4 | spinlock_t i_ceph_lock; | ||
| 5 | |||
| 6 | u64 i_version; | ||
| 7 | + u64 i_inline_version; | ||
| 8 | u32 i_time_warp_seq; | ||
| 9 | |||
| 10 | unsigned i_ceph_flags; | ||