Linus Torvalds 44e8967d59 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 31c542a199 ("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>		2014-12-17 18:47:01 -08:00
..
acl.c	ceph: include the initial ACL in create/mkdir/mknod MDS requests	2014-10-14 12:56:49 -07:00
addr.c	ceph: do_sync is never initialized	2014-12-17 20:09:53 +03:00
cache.c	ceph: fscache: Wait for completion of object initialization	2014-04-03 10:33:53 +08:00
cache.h	ceph: fscache: add an interface to synchronize object store limit	2014-04-03 10:33:53 +08:00
caps.c	ceph: flush inline version	2014-12-17 20:09:53 +03:00
ceph_frag.c	ceph: factor out libceph from Ceph file system	2010-10-20 15:37:28 -07:00
debugfs.c	assorted conversions to %p[dD]	2014-11-19 13:01:20 -05:00
dir.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2014-12-17 16:03:12 -08:00
export.c	ceph: ceph_get_parent() can be static	2014-06-06 09:29:50 +08:00
file.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2014-12-17 16:03:12 -08:00
inode.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2014-12-17 16:03:12 -08:00
ioctl.c	ceph: fix divide-by-zero in __validate_layout()	2014-10-14 12:57:05 -07:00
ioctl.h	ceph: fully initialize new layout	2012-05-16 14:28:27 -05:00
Kconfig	ceph: add acl for cephfs	2013-12-31 20:32:01 +02:00
locks.c	ceph: fix file lock interruption	2014-12-17 20:09:49 +03:00
Makefile	ceph: add acl for cephfs	2013-12-31 20:32:01 +02:00
mds_client.c	ceph: parse inline data in MClientReply and MClientCaps	2014-12-17 20:09:52 +03:00
mds_client.h	ceph: use getattr request to fetch inline data	2014-12-17 20:09:52 +03:00
mdsmap.c	fs/ceph: replace pr_warning by pr_warn	2014-06-06 16:08:06 -07:00
snap.c	ceph: flush inline version	2014-12-17 20:09:53 +03:00
strings.c	ceph: add get_name() NFS export callback	2014-04-03 10:33:53 +08:00
super.c	ceph: support inline data feature	2014-12-17 20:09:53 +03:00
super.h	ceph: flush inline version	2014-12-17 20:09:53 +03:00
xattr.c	ceph: fix setting empty extended attribute	2014-12-17 20:18:49 +03:00