Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / staging / lustre / lustre / llite / llite_mmap.c

diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c b/drivers/staging/lustre/lustre/llite/llite_mmap.c
index ba1c047..479bf42 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/llite_mmap.c
+++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c
@@ -234,8 +234,7 @@ static int ll_page_mkwrite0(struct vm_area_struct *vma, struct page *vmpage,
                         */
                        unlock_page(vmpage);
 
-                       CDEBUG(D_MMAP, "Race on page_mkwrite %p/%lu, page has "
-                              "been written out, retry.\n",
+                       CDEBUG(D_MMAP, "Race on page_mkwrite %p/%lu, page has been written out, retry.\n",
                               vmpage, vmpage->index);
 
                        *retry = true;
@@ -366,8 +365,7 @@ restart:
                        vmf->page = NULL;
 
                        if (!printed && ++count > 16) {
-                               CWARN("the page is under heavy contention,"
-                                     "maybe your app(%s) needs revising :-)\n",
+                               CWARN("the page is under heavy contention, maybe your app(%s) needs revising :-)\n",
                                      current->comm);
                                printed = true;
                        }
@@ -393,8 +391,7 @@ static int ll_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
                result = ll_page_mkwrite0(vma, vmf->page, &retry);
 
                if (!printed && ++count > 16) {
-                       CWARN("app(%s): the page %lu of file %lu is under heavy"
-                             " contention.\n",
+                       CWARN("app(%s): the page %lu of file %lu is under heavy contention.\n",
                              current->comm, vmf->pgoff,
                              file_inode(vma->vm_file)->i_ino);
                        printed = true;