From: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
---
fs/cifs/cifsproto.h | 15 +++++++++++++++
fs/cifs/file.c | 28 ++++++++++++++--------------
fs/cifs/smb2file.c | 30 ++++++++++++++++++++++++++++++
fs/cifs/smb2inode.c | 4 ++--
fs/cifs/smb2proto.h | 3 +++
5 files changed, 64 insertions(+), 16 deletions(-)
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 1129f16..eee59f7 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -193,6 +193,21 @@ extern ssize_t cifs_iovec_read_generic(struct file *file,
unsigned long nr_segs, loff_t *poffset,
iread_callback_t *read_cb);
extern void cifs_mark_open_files_invalid(struct cifs_tcon *tcon);
+extern int cifs_write_end(struct file *file, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned copied,
+ struct page *page, void *fsdata);
+extern int cifs_write_begin(struct file *file, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata);
+extern int cifs_release_page(struct page *page, gfp_t gfp);
+extern void cifs_invalidate_page(struct page *page, unsigned long offset);
+extern int cifs_launder_page(struct page *page);
+extern int cifs_readpage(struct file *file, struct page *page);
+extern int cifs_readpages(struct file *file, struct address_space *mapping,
+ struct list_head *page_list, unsigned num_pages);
+extern int cifs_writepages(struct address_space *mapping,
+ struct writeback_control *wbc);
+extern int cifs_writepage(struct page *page, struct writeback_control *wbc);
void cifs_proc_init(void);
void cifs_proc_clean(void);
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 44f678a..6eb1741 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1699,7 +1699,7 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to)
return rc;
}
-static int cifs_writepages(struct address_space *mapping,
+int cifs_writepages(struct address_space *mapping,
struct writeback_control *wbc)
{
struct cifs_sb_info *cifs_sb = CIFS_SB(mapping->host->i_sb);
@@ -1937,16 +1937,16 @@ retry_write:
return rc;
}
-static int cifs_writepage(struct page *page, struct writeback_control *wbc)
+int cifs_writepage(struct page *page, struct writeback_control *wbc)
{
int rc = cifs_writepage_locked(page, wbc);
unlock_page(page);
return rc;
}
-static int cifs_write_end(struct file *file, struct address_space *mapping,
- loff_t pos, unsigned len, unsigned copied,
- struct page *page, void *fsdata)
+int cifs_write_end(struct file *file, struct address_space *mapping, loff_t pos,
+ unsigned len, unsigned copied, struct page *page,
+ void *fsdata)
{
int rc;
struct inode *inode = mapping->host;
@@ -2631,8 +2631,8 @@ int cifs_file_mmap(struct file *file, struct vm_area_struct *vma)
return rc;
}
-static int cifs_readpages(struct file *file, struct address_space *mapping,
- struct list_head *page_list, unsigned num_pages)
+int cifs_readpages(struct file *file, struct address_space *mapping,
+ struct list_head *page_list, unsigned num_pages)
{
int rc;
struct list_head tmplist;
@@ -2825,7 +2825,7 @@ read_complete:
return rc;
}
-static int cifs_readpage(struct file *file, struct page *page)
+int cifs_readpage(struct file *file, struct page *page)
{
loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT;
int rc = -EACCES;
@@ -2895,9 +2895,9 @@ bool is_size_safe_to_change(struct cifsInodeInfo *cifsInode, __u64 end_of_file)
return true;
}
-static int cifs_write_begin(struct file *file, struct address_space *mapping,
- loff_t pos, unsigned len, unsigned flags,
- struct page **pagep, void **fsdata)
+int cifs_write_begin(struct file *file, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata)
{
pgoff_t index = pos >> PAGE_CACHE_SHIFT;
loff_t offset = pos & (PAGE_CACHE_SIZE - 1);
@@ -2967,7 +2967,7 @@ out:
return rc;
}
-static int cifs_release_page(struct page *page, gfp_t gfp)
+int cifs_release_page(struct page *page, gfp_t gfp)
{
if (PagePrivate(page))
return 0;
@@ -2975,7 +2975,7 @@ static int cifs_release_page(struct page *page, gfp_t gfp)
return cifs_fscache_release_page(page, gfp);
}
-static void cifs_invalidate_page(struct page *page, unsigned long offset)
+void cifs_invalidate_page(struct page *page, unsigned long offset)
{
struct cifsInodeInfo *cifsi = CIFS_I(page->mapping->host);
@@ -2983,7 +2983,7 @@ static void cifs_invalidate_page(struct page *page, unsigned long offset)
cifs_fscache_invalidate_page(page, &cifsi->vfs_inode);
}
-static int cifs_launder_page(struct page *page)
+int cifs_launder_page(struct page *page)
{
int rc = 0;
loff_t range_start = page_offset(page);
diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c
index 3404d8a..1091934 100644
--- a/fs/cifs/smb2file.c
+++ b/fs/cifs/smb2file.c
@@ -148,6 +148,36 @@ const struct file_operations smb2_file_direct_nobrl_ops = {
.setlease = cifs_setlease,
};
+const struct address_space_operations smb2_addr_ops = {
+ .readpage = cifs_readpage,
+ .readpages = cifs_readpages,
+ .writepage = cifs_writepage,
+ .writepages = cifs_writepages,
+ .write_begin = cifs_write_begin,
+ .write_end = cifs_write_end,
+ .set_page_dirty = __set_page_dirty_nobuffers,
+ .releasepage = cifs_release_page,
+ .invalidatepage = cifs_invalidate_page,
+ .launder_page = cifs_launder_page,
+};
+
+/*
+ * cifs_readpages requires the server to support a buffer large enough to
+ * contain the header plus one complete page of data. Otherwise, we need
+ * to leave cifs_readpages out of the address space operations.
+ */
+const struct address_space_operations smb2_addr_ops_smallbuf = {
+ .readpage = cifs_readpage,
+ .writepage = cifs_writepage,
+ .writepages = cifs_writepages,
+ .write_begin = cifs_write_begin,
+ .write_end = cifs_write_end,
+ .set_page_dirty = __set_page_dirty_nobuffers,
+ .releasepage = cifs_release_page,
+ .invalidatepage = cifs_invalidate_page,
+ .launder_page = cifs_launder_page,
+};
+
struct cifsFileInfo *
smb2_new_fileinfo(__u64 persist_fid, __u64 volatile_fid, struct file *file,
struct tcon_link *tlink, __u32 oplock)
diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index 4b33f16..1d21185 100644
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -113,9 +113,9 @@ void smb2_set_ops(struct inode *inode)
/* check if server can support readpages */
if (cifs_sb_master_tcon(cifs_sb)->ses->server->max_read <
PAGE_CACHE_SIZE)
- inode->i_data.a_ops = &cifs_addr_ops_smallbuf;
+ inode->i_data.a_ops = &smb2_addr_ops_smallbuf;
else
- inode->i_data.a_ops = &cifs_addr_ops;
+ inode->i_data.a_ops = &smb2_addr_ops;
break;
case S_IFDIR:
#ifdef CONFIG_CIFS_DFS_UPCALL
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
index 30ab741..810a7fc 100644
--- a/fs/cifs/smb2proto.h
+++ b/fs/cifs/smb2proto.h
@@ -44,6 +44,9 @@ extern const struct file_operations smb2_file_nobrl_ops; /* no brlocks */
extern const struct file_operations smb2_file_direct_nobrl_ops;
extern const struct file_operations smb2_file_strict_nobrl_ops;
+extern const struct address_space_operations smb2_addr_ops;
+extern const struct address_space_operations smb2_addr_ops_smallbuf;
+
/* extern char *build_smb2path_from_dentry(struct dentry *);*/
extern __le16 *build_ucspath_from_dentry(struct dentry *);
/*extern __le16 *smb2_build_path_to_root(struct cifs_sb_info *smb2_sb);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
