Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / affs / file.c

diff --git a/fs/affs/file.c b/fs/affs/file.c
index 9df23175e28b910e5cec924dd87249956d4051a7..a7fe57d2cd9a0aa6a59df2cd90778127ebc2bbc3 100644 (file)
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -45,7 +45,7 @@ const struct inode_operations affs_file_inode_operations = {
 static int
 affs_file_open(struct inode *inode, struct file *filp)
 {
-       pr_debug("AFFS: open(%lu,%d)\n",
+       pr_debug("open(%lu,%d)\n",
                 inode->i_ino, atomic_read(&AFFS_I(inode)->i_opencnt));
        atomic_inc(&AFFS_I(inode)->i_opencnt);
        return 0;
@@ -54,7 +54,7 @@ affs_file_open(struct inode *inode, struct file *filp)
 static int
 affs_file_release(struct inode *inode, struct file *filp)
 {
-       pr_debug("AFFS: release(%lu, %d)\n",
+       pr_debug("release(%lu, %d)\n",
                 inode->i_ino, atomic_read(&AFFS_I(inode)->i_opencnt));
 
        if (atomic_dec_and_test(&AFFS_I(inode)->i_opencnt)) {
@@ -324,7 +324,8 @@ affs_get_block(struct inode *inode, sector_t block, struct buffer_head *bh_resul
        struct buffer_head      *ext_bh;
        u32                      ext;
 
-       pr_debug("AFFS: get_block(%u, %lu)\n", (u32)inode->i_ino, (unsigned long)block);
+       pr_debug("%s(%u, %lu)\n",
+                __func__, (u32)inode->i_ino, (unsigned long)block);
 
        BUG_ON(block > (sector_t)0x7fffffffUL);
 
@@ -498,34 +499,36 @@ affs_getemptyblk_ino(struct inode *inode, int block)
 }
 
 static int
-affs_do_readpage_ofs(struct file *file, struct page *page, unsigned from, unsigned to)
+affs_do_readpage_ofs(struct page *page, unsigned to)
 {
        struct inode *inode = page->mapping->host;
        struct super_block *sb = inode->i_sb;
        struct buffer_head *bh;
        char *data;
+       unsigned pos = 0;
        u32 bidx, boff, bsize;
        u32 tmp;
 
-       pr_debug("AFFS: read_page(%u, %ld, %d, %d)\n", (u32)inode->i_ino, page->index, from, to);
-       BUG_ON(from > to || to > PAGE_CACHE_SIZE);
+       pr_debug("%s(%u, %ld, 0, %d)\n", __func__, (u32)inode->i_ino,
+                page->index, to);
+       BUG_ON(to > PAGE_CACHE_SIZE);
        kmap(page);
        data = page_address(page);
        bsize = AFFS_SB(sb)->s_data_blksize;
-       tmp = (page->index << PAGE_CACHE_SHIFT) + from;
+       tmp = page->index << PAGE_CACHE_SHIFT;
        bidx = tmp / bsize;
        boff = tmp % bsize;
 
-       while (from < to) {
+       while (pos < to) {
                bh = affs_bread_ino(inode, bidx, 0);
                if (IS_ERR(bh))
                        return PTR_ERR(bh);
-               tmp = min(bsize - boff, to - from);
-               BUG_ON(from + tmp > to || tmp > bsize);
-               memcpy(data + from, AFFS_DATA(bh) + boff, tmp);
+               tmp = min(bsize - boff, to - pos);
+               BUG_ON(pos + tmp > to || tmp > bsize);
+               memcpy(data + pos, AFFS_DATA(bh) + boff, tmp);
                affs_brelse(bh);
                bidx++;
-               from += tmp;
+               pos += tmp;
                boff = 0;
        }
        flush_dcache_page(page);
@@ -542,7 +545,7 @@ affs_extent_file_ofs(struct inode *inode, u32 newsize)
        u32 size, bsize;
        u32 tmp;
 
-       pr_debug("AFFS: extent_file(%u, %d)\n", (u32)inode->i_ino, newsize);
+       pr_debug("%s(%u, %d)\n", __func__, (u32)inode->i_ino, newsize);
        bsize = AFFS_SB(sb)->s_data_blksize;
        bh = NULL;
        size = AFFS_I(inode)->mmu_private;
@@ -608,14 +611,14 @@ affs_readpage_ofs(struct file *file, struct page *page)
        u32 to;
        int err;
 
-       pr_debug("AFFS: read_page(%u, %ld)\n", (u32)inode->i_ino, page->index);
+       pr_debug("%s(%u, %ld)\n", __func__, (u32)inode->i_ino, page->index);
        to = PAGE_CACHE_SIZE;
        if (((page->index + 1) << PAGE_CACHE_SHIFT) > inode->i_size) {
                to = inode->i_size & ~PAGE_CACHE_MASK;
                memset(page_address(page) + to, 0, PAGE_CACHE_SIZE - to);
        }
 
-       err = affs_do_readpage_ofs(file, page, 0, to);
+       err = affs_do_readpage_ofs(page, to);
        if (!err)
                SetPageUptodate(page);
        unlock_page(page);
@@ -631,7 +634,8 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping
        pgoff_t index;
        int err = 0;
 
-       pr_debug("AFFS: write_begin(%u, %llu, %llu)\n", (u32)inode->i_ino, (unsigned long long)pos, (unsigned long long)pos + len);
+       pr_debug("%s(%u, %llu, %llu)\n", __func__, (u32)inode->i_ino,
+                (unsigned long long)pos, (unsigned long long)pos + len);
        if (pos > AFFS_I(inode)->mmu_private) {
                /* XXX: this probably leaves a too-big i_size in case of
                 * failure. Should really be updating i_size at write_end time
@@ -651,7 +655,7 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping
                return 0;
 
        /* XXX: inefficient but safe in the face of short writes */
-       err = affs_do_readpage_ofs(file, page, 0, PAGE_CACHE_SIZE);
+       err = affs_do_readpage_ofs(page, PAGE_CACHE_SIZE);
        if (err) {
                unlock_page(page);
                page_cache_release(page);
@@ -680,7 +684,9 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,
         * due to write_begin.
         */
 
-       pr_debug("AFFS: write_begin(%u, %llu, %llu)\n", (u32)inode->i_ino, (unsigned long long)pos, (unsigned long long)pos + len);
+       pr_debug("%s(%u, %llu, %llu)\n",
+                __func__, (u32)inode->i_ino, (unsigned long long)pos,
+               (unsigned long long)pos + len);
        bsize = AFFS_SB(sb)->s_data_blksize;
        data = page_address(page);
 
@@ -802,7 +808,7 @@ affs_free_prealloc(struct inode *inode)
 {
        struct super_block *sb = inode->i_sb;
 
-       pr_debug("AFFS: free_prealloc(ino=%lu)\n", inode->i_ino);
+       pr_debug("free_prealloc(ino=%lu)\n", inode->i_ino);
 
        while (AFFS_I(inode)->i_pa_cnt) {
                AFFS_I(inode)->i_pa_cnt--;
@@ -822,7 +828,7 @@ affs_truncate(struct inode *inode)
        struct buffer_head *ext_bh;
        int i;
 
-       pr_debug("AFFS: truncate(inode=%d, oldsize=%u, newsize=%u)\n",
+       pr_debug("truncate(inode=%d, oldsize=%u, newsize=%u)\n",
                 (u32)inode->i_ino, (u32)AFFS_I(inode)->mmu_private, (u32)inode->i_size);
 
        last_blk = 0;