diff options
author | Alex Elder <elder@inktank.com> | 2013-02-19 20:20:56 -0500 |
---|---|---|
committer | Alex Elder <elder@inktank.com> | 2013-02-19 20:21:08 -0500 |
commit | 4c7a08c83a7842e88838dde16684d6bafffdfaf0 (patch) | |
tree | c5fe0057b2ff9f98a64ceb6fa076e75da8225cdd /fs/ceph/super.h | |
parent | 19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff) | |
parent | 903bb32e890237ca43ab847e561e5377cfe0fdb3 (diff) |
Merge branch 'testing' of github.com:ceph/ceph-client into into linux-3.8-ceph
Diffstat (limited to 'fs/ceph/super.h')
-rw-r--r-- | fs/ceph/super.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 66ebe720e40d..9861cce10a49 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h | |||
@@ -798,13 +798,7 @@ extern int ceph_mmap(struct file *file, struct vm_area_struct *vma); | |||
798 | /* file.c */ | 798 | /* file.c */ |
799 | extern const struct file_operations ceph_file_fops; | 799 | extern const struct file_operations ceph_file_fops; |
800 | extern const struct address_space_operations ceph_aops; | 800 | extern const struct address_space_operations ceph_aops; |
801 | extern int ceph_copy_to_page_vector(struct page **pages, | 801 | |
802 | const char *data, | ||
803 | loff_t off, size_t len); | ||
804 | extern int ceph_copy_from_page_vector(struct page **pages, | ||
805 | char *data, | ||
806 | loff_t off, size_t len); | ||
807 | extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags); | ||
808 | extern int ceph_open(struct inode *inode, struct file *file); | 802 | extern int ceph_open(struct inode *inode, struct file *file); |
809 | extern int ceph_atomic_open(struct inode *dir, struct dentry *dentry, | 803 | extern int ceph_atomic_open(struct inode *dir, struct dentry *dentry, |
810 | struct file *file, unsigned flags, umode_t mode, | 804 | struct file *file, unsigned flags, umode_t mode, |