diff options
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r-- | fs/cifs/file.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 14a1c72ced92..b67be3d8c019 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -870,7 +870,6 @@ static ssize_t cifs_write(struct file *file, const char *write_data, | |||
870 | if (rc != 0) | 870 | if (rc != 0) |
871 | break; | 871 | break; |
872 | } | 872 | } |
873 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
874 | /* BB FIXME We can not sign across two buffers yet */ | 873 | /* BB FIXME We can not sign across two buffers yet */ |
875 | if((experimEnabled) && ((pTcon->ses->server->secMode & | 874 | if((experimEnabled) && ((pTcon->ses->server->secMode & |
876 | (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) == 0)) { | 875 | (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) == 0)) { |
@@ -889,7 +888,6 @@ static ssize_t cifs_write(struct file *file, const char *write_data, | |||
889 | iov, 1, long_op); | 888 | iov, 1, long_op); |
890 | } else | 889 | } else |
891 | /* BB FIXME fixup indentation of line below */ | 890 | /* BB FIXME fixup indentation of line below */ |
892 | #endif | ||
893 | rc = CIFSSMBWrite(xid, pTcon, | 891 | rc = CIFSSMBWrite(xid, pTcon, |
894 | open_file->netfid, | 892 | open_file->netfid, |
895 | min_t(const int, cifs_sb->wsize, | 893 | min_t(const int, cifs_sb->wsize, |
@@ -1026,7 +1024,6 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to) | |||
1026 | return rc; | 1024 | return rc; |
1027 | } | 1025 | } |
1028 | 1026 | ||
1029 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
1030 | static int cifs_writepages(struct address_space *mapping, | 1027 | static int cifs_writepages(struct address_space *mapping, |
1031 | struct writeback_control *wbc) | 1028 | struct writeback_control *wbc) |
1032 | { | 1029 | { |
@@ -1229,7 +1226,6 @@ retry: | |||
1229 | 1226 | ||
1230 | return rc; | 1227 | return rc; |
1231 | } | 1228 | } |
1232 | #endif | ||
1233 | 1229 | ||
1234 | static int cifs_writepage(struct page* page, struct writeback_control *wbc) | 1230 | static int cifs_writepage(struct page* page, struct writeback_control *wbc) |
1235 | { | 1231 | { |
@@ -1875,9 +1871,7 @@ struct address_space_operations cifs_addr_ops = { | |||
1875 | .readpage = cifs_readpage, | 1871 | .readpage = cifs_readpage, |
1876 | .readpages = cifs_readpages, | 1872 | .readpages = cifs_readpages, |
1877 | .writepage = cifs_writepage, | 1873 | .writepage = cifs_writepage, |
1878 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
1879 | .writepages = cifs_writepages, | 1874 | .writepages = cifs_writepages, |
1880 | #endif | ||
1881 | .prepare_write = cifs_prepare_write, | 1875 | .prepare_write = cifs_prepare_write, |
1882 | .commit_write = cifs_commit_write, | 1876 | .commit_write = cifs_commit_write, |
1883 | .set_page_dirty = __set_page_dirty_nobuffers, | 1877 | .set_page_dirty = __set_page_dirty_nobuffers, |