Merge branch 'for-linus' of git://git.kernel.dk/linux-block

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

diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 3a3821b00486b531e72ff931be80b3627a0ddca1..eccb1c89ccbb20b2a597798a11cbe7c4e802a0e9 100644 (file)
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -13,11 +13,7 @@
  * 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
- *
- * Written by Koji Sato <koji@osrg.net>.
+ * Written by Koji Sato.
  */
 
 #include <linux/slab.h>
@@ -689,7 +685,8 @@ static int nilfs_btree_lookup(const struct nilfs_bmap *btree,
 }
 
 static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree,
-                                    __u64 key, __u64 *ptrp, unsigned maxblocks)
+                                    __u64 key, __u64 *ptrp,
+                                    unsigned int maxblocks)
 {
        struct nilfs_btree_path *path;
        struct nilfs_btree_node *node;
@@ -1032,12 +1029,12 @@ static __u64 nilfs_btree_find_target_v(const struct nilfs_bmap *btree,
        if (ptr != NILFS_BMAP_INVALID_PTR)
                /* sequential access */
                return ptr;
-       else {
-               ptr = nilfs_btree_find_near(btree, path);
-               if (ptr != NILFS_BMAP_INVALID_PTR)
-                       /* near */
-                       return ptr;
-       }
+
+       ptr = nilfs_btree_find_near(btree, path);
+       if (ptr != NILFS_BMAP_INVALID_PTR)
+               /* near */
+               return ptr;
+
        /* block group */
        return nilfs_bmap_find_target_in_group(btree);
 }