src/patches/suse-2.6.27.31/patches.suse/dlm-remove-kmap-and-kunmap.patch

   1 From: Steven Whitehouse <swhiteho@redhat.com>
   2 commit 1521848cbb42935a52d11305c054b14461ad061c
   3 Author: Steven Whitehouse <swhiteho@redhat.com>
   4 Date:   Wed Nov 12 17:00:16 2008 -0600
   5 Subject: dlm: remove kmap/kunmap
   6
   7     The pages used in lowcomms are not highmem, so kmap is not necessary.
   8
   9 Cc: Christine Caulfield <ccaulfie@redhat.com>
  10 Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  11 Signed-off-by: David Teigland <teigland@redhat.com>
  12 Signed-off-by: Coly Li <coly.li@suse.de>
  13
  14 diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
  15 index 1e72031..103a5eb 100644
  16 --- a/fs/dlm/lowcomms.c
  17 +++ b/fs/dlm/lowcomms.c
  18 @@ -824,7 +824,6 @@ static void sctp_init_assoc(struct connection *con)
  19         len = e->len;
  20         offset = e->offset;
  21         spin_unlock(&con->writequeue_lock);
  22 -       kmap(e->page);
  23
  24         /* Send the first block off the write queue */
  25         iov[0].iov_base = page_address(e->page)+offset;
  26 @@ -855,7 +854,6 @@ static void sctp_init_assoc(struct connection *con)
  27
  28                 if (e->len == 0 && e->users == 0) {
  29                         list_del(&e->list);
  30 -                       kunmap(e->page);
  31                         free_entry(e);
  32                 }
  33                 spin_unlock(&con->writequeue_lock);
  34 @@ -1204,8 +1202,6 @@ void *dlm_lowcomms_get_buffer(int nodeid, int len, gfp_t allocation, char **ppc)
  35
  36         if (e) {
  37         got_one:
  38 -               if (users == 0)
  39 -                       kmap(e->page);
  40                 *ppc = page_address(e->page) + offset;
  41                 return e;
  42         }
  43 @@ -1234,7 +1230,6 @@ void dlm_lowcomms_commit_buffer(void *mh)
  44         if (users)
  45                 goto out;
  46         e->len = e->end - e->offset;
  47 -       kunmap(e->page);
  48         spin_unlock(&con->writequeue_lock);
  49
  50         if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags)) {
  51 @@ -1273,7 +1268,6 @@ static void send_to_sock(struct connection *con)
  52                 offset = e->offset;
  53                 BUG_ON(len == 0 && e->users == 0);
  54                 spin_unlock(&con->writequeue_lock);
  55 -               kmap(e->page);
  56
  57                 ret = 0;
  58                 if (len) {
  59 @@ -1295,7 +1289,6 @@ static void send_to_sock(struct connection *con)
  60
  61                 if (e->len == 0 && e->users == 0) {
  62                         list_del(&e->list);
  63 -                       kunmap(e->page);
  64                         free_entry(e);
  65                         continue;
  66                 }