Merge tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux

[cascardo/linux.git] / fs / cramfs / inode.c

diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index ddcfe59..355c522 100644 (file)
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -11,6 +11,8 @@
  * The actual compression is based on zlib, see the other files.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
@@ -21,7 +23,7 @@
 #include <linux/vfs.h>
 #include <linux/mutex.h>
 #include <uapi/linux/cramfs_fs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include "internal.h"
 
@@ -153,7 +155,7 @@ static struct inode *get_cramfs_inode(struct super_block *sb,
 
 static unsigned char read_buffers[READ_BUFFERS][BUFFER_SIZE];
 static unsigned buffer_blocknr[READ_BUFFERS];
-static struct super_block * buffer_dev[READ_BUFFERS];
+static struct super_block *buffer_dev[READ_BUFFERS];
 static int next_buffer;
 
 /*
@@ -205,6 +207,7 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i
 
        for (i = 0; i < BLKS_PER_BUF; i++) {
                struct page *page = pages[i];
+
                if (page) {
                        wait_on_page_locked(page);
                        if (!PageUptodate(page)) {
@@ -223,6 +226,7 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i
        data = read_buffers[buffer];
        for (i = 0; i < BLKS_PER_BUF; i++) {
                struct page *page = pages[i];
+
                if (page) {
                        memcpy(data, kmap(page), PAGE_CACHE_SIZE);
                        kunmap(page);
@@ -237,6 +241,7 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i
 static void cramfs_kill_sb(struct super_block *sb)
 {
        struct cramfs_sb_info *sbi = CRAMFS_SB(sb);
+
        kill_block_super(sb);
        kfree(sbi);
 }
@@ -277,7 +282,7 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent)
                /* check for wrong endianness */
                if (super.magic == CRAMFS_MAGIC_WEND) {
                        if (!silent)
-                               printk(KERN_ERR "cramfs: wrong endianness\n");
+                               pr_err("wrong endianness\n");
                        return -EINVAL;
                }
 
@@ -287,22 +292,22 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent)
                mutex_unlock(&read_mutex);
                if (super.magic != CRAMFS_MAGIC) {
                        if (super.magic == CRAMFS_MAGIC_WEND && !silent)
-                               printk(KERN_ERR "cramfs: wrong endianness\n");
+                               pr_err("wrong endianness\n");
                        else if (!silent)
-                               printk(KERN_ERR "cramfs: wrong magic\n");
+                               pr_err("wrong magic\n");
                        return -EINVAL;
                }
        }
 
        /* get feature flags first */
        if (super.flags & ~CRAMFS_SUPPORTED_FLAGS) {
-               printk(KERN_ERR "cramfs: unsupported filesystem features\n");
+               pr_err("unsupported filesystem features\n");
                return -EINVAL;
        }
 
        /* Check that the root inode is in a sane state */
        if (!S_ISDIR(super.root.mode)) {
-               printk(KERN_ERR "cramfs: root is not a directory\n");
+               pr_err("root is not a directory\n");
                return -EINVAL;
        }
        /* correct strange, hard-coded permissions of mkcramfs */
@@ -310,23 +315,23 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent)
 
        root_offset = super.root.offset << 2;
        if (super.flags & CRAMFS_FLAG_FSID_VERSION_2) {
-               sbi->size=super.size;
-               sbi->blocks=super.fsid.blocks;
-               sbi->files=super.fsid.files;
+               sbi->size = super.size;
+               sbi->blocks = super.fsid.blocks;
+               sbi->files = super.fsid.files;
        } else {
-               sbi->size=1<<28;
-               sbi->blocks=0;
-               sbi->files=0;
+               sbi->size = 1<<28;
+               sbi->blocks = 0;
+               sbi->files = 0;
        }
-       sbi->magic=super.magic;
-       sbi->flags=super.flags;
+       sbi->magic = super.magic;
+       sbi->flags = super.flags;
        if (root_offset == 0)
-               printk(KERN_INFO "cramfs: empty filesystem");
+               pr_info("empty filesystem");
        else if (!(super.flags & CRAMFS_FLAG_SHIFTED_ROOT_OFFSET) &&
                 ((root_offset != sizeof(struct cramfs_super)) &&
                  (root_offset != 512 + sizeof(struct cramfs_super))))
        {
-               printk(KERN_ERR "cramfs: bad root offset %lu\n", root_offset);
+               pr_err("bad root offset %lu\n", root_offset);
                return -EINVAL;
        }
 
@@ -425,7 +430,7 @@ static int cramfs_readdir(struct file *file, struct dir_context *ctx)
 /*
  * Lookup and fill in the inode data..
  */
-static struct dentry * cramfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
+static struct dentry *cramfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
 {
        unsigned int offset = 0;
        struct inode *inode = NULL;
@@ -483,7 +488,7 @@ out:
        return NULL;
 }
 
-static int cramfs_readpage(struct file *file, struct page * page)
+static int cramfs_readpage(struct file *file, struct page *page)
 {
        struct inode *inode = page->mapping->host;
        u32 maxblock;
@@ -511,7 +516,7 @@ static int cramfs_readpage(struct file *file, struct page * page)
                if (compr_len == 0)
                        ; /* hole */
                else if (unlikely(compr_len > (PAGE_CACHE_SIZE << 1))) {
-                       pr_err("cramfs: bad compressed blocksize %u\n",
+                       pr_err("bad compressed blocksize %u\n",
                                compr_len);
                        goto err;
                } else {