Merge tag 'drm-intel-next-fixes-2016-05-25' of git://anongit.freedesktop.org/drm...

[deliverable/linux.git] / fs / nilfs2 / alloc.c

diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c
index 2ccbf5531554b74612420c6bd1ff6cc8ca7d6463..1a85d94f5b25f161fdcdef907d506d1c157a78bd 100644 (file)
--- a/fs/nilfs2/alloc.c
+++ b/fs/nilfs2/alloc.c
@@ -13,13 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Original code was written by Koji Sato <koji@osrg.net>.
- * Two allocators were unified by Ryusuke Konishi <ryusuke@osrg.net>,
- *                                Amagai Yoshiji <amagai@osrg.net>.
+ * Originally written by Koji Sato.
+ * Two allocators were unified by Ryusuke Konishi and Amagai Yoshiji.
  */
 
 #include <linux/types.h>
@@ -58,7 +53,7 @@ nilfs_palloc_groups_count(const struct inode *inode)
  * @inode: inode of metadata file using this allocator
  * @entry_size: size of the persistent object
  */
-int nilfs_palloc_init_blockgroup(struct inode *inode, unsigned entry_size)
+int nilfs_palloc_init_blockgroup(struct inode *inode, unsigned int entry_size)
 {
        struct nilfs_mdt_info *mi = NILFS_MDT(inode);
 
@@ -73,13 +68,17 @@ int nilfs_palloc_init_blockgroup(struct inode *inode, unsigned entry_size)
        mi->mi_blocks_per_group =
                DIV_ROUND_UP(nilfs_palloc_entries_per_group(inode),
                             mi->mi_entries_per_block) + 1;
-               /* Number of blocks in a group including entry blocks and
-                  a bitmap block */
+               /*
+                * Number of blocks in a group including entry blocks
+                * and a bitmap block
+                */
        mi->mi_blocks_per_desc_block =
                nilfs_palloc_groups_per_desc_block(inode) *
                mi->mi_blocks_per_group + 1;
-               /* Number of blocks per descriptor including the
-                  descriptor block */
+               /*
+                * Number of blocks per descriptor including the
+                * descriptor block
+                */
        return 0;
 }
 
@@ -389,7 +388,7 @@ void *nilfs_palloc_block_get_entry(const struct inode *inode, __u64 nr,
  */
 static int nilfs_palloc_find_available_slot(unsigned char *bitmap,
                                            unsigned long target,
-                                           unsigned bsize,
+                                           unsigned int bsize,
                                            spinlock_t *lock)
 {
        int pos, end = bsize;
@@ -624,7 +623,7 @@ void nilfs_palloc_commit_free_entry(struct inode *inode,
 
        if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))
                nilfs_warning(inode->i_sb, __func__,
-                             "entry number %llu already freed: ino=%lu\n",
+                             "entry number %llu already freed: ino=%lu",
                              (unsigned long long)req->pr_entry_nr,
                              (unsigned long)inode->i_ino);
        else
@@ -665,7 +664,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode,
 
        if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))
                nilfs_warning(inode->i_sb, __func__,
-                             "entry number %llu already freed: ino=%lu\n",
+                             "entry number %llu already freed: ino=%lu",
                              (unsigned long long)req->pr_entry_nr,
                              (unsigned long)inode->i_ino);
        else
@@ -740,8 +739,8 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)
        unsigned long group, group_offset;
        __u64 group_min_nr, last_nrs[8];
        const unsigned long epg = nilfs_palloc_entries_per_group(inode);
-       const unsigned epb = NILFS_MDT(inode)->mi_entries_per_block;
-       unsigned entry_start, end, pos;
+       const unsigned int epb = NILFS_MDT(inode)->mi_entries_per_block;
+       unsigned int entry_start, end, pos;
        spinlock_t *lock;
        int i, j, k, ret;
        u32 nfree;
@@ -774,7 +773,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)
                        if (!nilfs_clear_bit_atomic(lock, group_offset,
                                                    bitmap)) {
                                nilfs_warning(inode->i_sb, __func__,
-                                             "entry number %llu already freed: ino=%lu\n",
+                                             "entry number %llu already freed: ino=%lu",
                                              (unsigned long long)entry_nrs[j],
                                              (unsigned long)inode->i_ino);
                        } else {
@@ -819,7 +818,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)
                                                              last_nrs[k]);
                        if (ret && ret != -ENOENT) {
                                nilfs_warning(inode->i_sb, __func__,
-                                             "failed to delete block of entry %llu: ino=%lu, err=%d\n",
+                                             "failed to delete block of entry %llu: ino=%lu, err=%d",
                                              (unsigned long long)last_nrs[k],
                                              (unsigned long)inode->i_ino, ret);
                        }
@@ -838,7 +837,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)
                        ret = nilfs_palloc_delete_bitmap_block(inode, group);
                        if (ret && ret != -ENOENT) {
                                nilfs_warning(inode->i_sb, __func__,
-                                             "failed to delete bitmap block of group %lu: ino=%lu, err=%d\n",
+                                             "failed to delete bitmap block of group %lu: ino=%lu, err=%d",
                                              group,
                                              (unsigned long)inode->i_ino, ret);
                        }