aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm/lowcomms.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/dlm/lowcomms.c')
-rw-r--r--fs/dlm/lowcomms.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 1e720316300b..103a5ebd1371 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -824,7 +824,6 @@ static void sctp_init_assoc(struct connection *con)
824 len = e->len; 824 len = e->len;
825 offset = e->offset; 825 offset = e->offset;
826 spin_unlock(&con->writequeue_lock); 826 spin_unlock(&con->writequeue_lock);
827 kmap(e->page);
828 827
829 /* Send the first block off the write queue */ 828 /* Send the first block off the write queue */
830 iov[0].iov_base = page_address(e->page)+offset; 829 iov[0].iov_base = page_address(e->page)+offset;
@@ -855,7 +854,6 @@ static void sctp_init_assoc(struct connection *con)
855 854
856 if (e->len == 0 && e->users == 0) { 855 if (e->len == 0 && e->users == 0) {
857 list_del(&e->list); 856 list_del(&e->list);
858 kunmap(e->page);
859 free_entry(e); 857 free_entry(e);
860 } 858 }
861 spin_unlock(&con->writequeue_lock); 859 spin_unlock(&con->writequeue_lock);
@@ -1204,8 +1202,6 @@ void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc)
1204 1202
1205 if (e) { 1203 if (e) {
1206 got_one: 1204 got_one:
1207 if (users == 0)
1208 kmap(e->page);
1209 *ppc = page_address(e->page) + offset; 1205 *ppc = page_address(e->page) + offset;
1210 return e; 1206 return e;
1211 } 1207 }
@@ -1234,7 +1230,6 @@ void dlm_lowcomms_commit_buffer(void *mh)
1234 if (users) 1230 if (users)
1235 goto out; 1231 goto out;
1236 e->len = e->end - e->offset; 1232 e->len = e->end - e->offset;
1237 kunmap(e->page);
1238 spin_unlock(&con->writequeue_lock); 1233 spin_unlock(&con->writequeue_lock);
1239 1234
1240 if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags)) { 1235 if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags)) {
@@ -1273,7 +1268,6 @@ static void send_to_sock(struct connection *con)
1273 offset = e->offset; 1268 offset = e->offset;
1274 BUG_ON(len == 0 && e->users == 0); 1269 BUG_ON(len == 0 && e->users == 0);
1275 spin_unlock(&con->writequeue_lock); 1270 spin_unlock(&con->writequeue_lock);
1276 kmap(e->page);
1277 1271
1278 ret = 0; 1272 ret = 0;
1279 if (len) { 1273 if (len) {
@@ -1295,7 +1289,6 @@ static void send_to_sock(struct connection *con)
1295 1289
1296 if (e->len == 0 && e->users == 0) { 1290 if (e->len == 0 && e->users == 0) {
1297 list_del(&e->list); 1291 list_del(&e->list);
1298 kunmap(e->page);
1299 free_entry(e); 1292 free_entry(e);
1300 continue; 1293 continue;
1301 } 1294 }