Merge branch 'akpm' (patches from Andrew)

Merge third patchbomb from Andrew Morton:

 - various misc things

 - a couple of lib/ optimisations

 - provide DIV_ROUND_CLOSEST_ULL()

 - checkpatch updates

 - rtc tree

 - befs, nilfs2, hfs, hfsplus, fatfs, adfs, affs, bfs

 - ptrace fixes

 - fork() fixes

 - seccomp cleanups

 - more mmap_sem hold time reductions from Davidlohr

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (138 commits)
  proc: show locks in /proc/pid/fdinfo/X
  docs: add missing and new /proc/PID/status file entries, fix typos
  drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
  Documentation/spi/spidev_test.c: fix warning
  drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type
  .gitignore: ignore *.tar
  MAINTAINERS: add Mediatek SoC mailing list
  tomoyo: reduce mmap_sem hold for mm->exe_file
  powerpc/oprofile: reduce mmap_sem hold for exe_file
  oprofile: reduce mmap_sem hold for mm->exe_file
  mips: ip32: add platform data hooks to use DS1685 driver
  lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
  x86: switch to using asm-generic for seccomp.h
  sparc: switch to using asm-generic for seccomp.h
  powerpc: switch to using asm-generic for seccomp.h
  parisc: switch to using asm-generic for seccomp.h
  mips: switch to using asm-generic for seccomp.h
  microblaze: use asm-generic for seccomp.h
  arm: use asm-generic for seccomp.h
  seccomp: allow COMPAT sigreturn overrides
  ...

12 files changed, 274 insertions, 62 deletions

diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c
index 741fd02e0444..8df0f3b7839b 100644
--- a/fs/nilfs2/alloc.c
+++ b/fs/nilfs2/alloc.c
@@ -405,13 +405,14 @@ nilfs_palloc_rest_groups_in_desc_block(const struct inode *inode,
 static int nilfs_palloc_count_desc_blocks(struct inode *inode,
                                             unsigned long *desc_blocks)
 {
-        unsigned long blknum;
+        __u64 blknum;
         int ret;
 
         ret = nilfs_bmap_last_key(NILFS_I(inode)->i_bmap, &blknum);
         if (likely(!ret))
                 *desc_blocks = DIV_ROUND_UP(
-                        blknum, NILFS_MDT(inode)->mi_blocks_per_desc_block);
+                        (unsigned long)blknum,
+                        NILFS_MDT(inode)->mi_blocks_per_desc_block);
         return ret;
 }
 
diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c
index aadbd0b5e3e8..27f75bcbeb30 100644
--- a/fs/nilfs2/bmap.c
+++ b/fs/nilfs2/bmap.c
@@ -152,9 +152,7 @@ static int nilfs_bmap_do_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr)
  *
  * %-EEXIST - A record associated with @key already exist.
  */
-int nilfs_bmap_insert(struct nilfs_bmap *bmap,
-                      unsigned long key,
-                      unsigned long rec)
+int nilfs_bmap_insert(struct nilfs_bmap *bmap, __u64 key, unsigned long rec)
 {
         int ret;
 
@@ -191,19 +189,47 @@ static int nilfs_bmap_do_delete(struct nilfs_bmap *bmap, __u64 key)
         return bmap->b_ops->bop_delete(bmap, key);
 }
 
-int nilfs_bmap_last_key(struct nilfs_bmap *bmap, unsigned long *key)
+/**
+ * nilfs_bmap_seek_key - seek a valid entry and return its key
+ * @bmap: bmap struct
+ * @start: start key number
+ * @keyp: place to store valid key
+ *
+ * Description: nilfs_bmap_seek_key() seeks a valid key on @bmap
+ * starting from @start, and stores it to @keyp if found.
+ *
+ * Return Value: On success, 0 is returned. On error, one of the following
+ * negative error codes is returned.
+ *
+ * %-EIO - I/O error.
+ *
+ * %-ENOMEM - Insufficient amount of memory available.
+ *
+ * %-ENOENT - No valid entry was found
+ */
+int nilfs_bmap_seek_key(struct nilfs_bmap *bmap, __u64 start, __u64 *keyp)
 {
-        __u64 lastkey;
         int ret;
 
         down_read(&bmap->b_sem);
-        ret = bmap->b_ops->bop_last_key(bmap, &lastkey);
+        ret = bmap->b_ops->bop_seek_key(bmap, start, keyp);
+        up_read(&bmap->b_sem);
+
+        if (ret < 0)
+                ret = nilfs_bmap_convert_error(bmap, __func__, ret);
+        return ret;
+}
+
+int nilfs_bmap_last_key(struct nilfs_bmap *bmap, __u64 *keyp)
+{
+        int ret;
+
+        down_read(&bmap->b_sem);
+        ret = bmap->b_ops->bop_last_key(bmap, keyp);
         up_read(&bmap->b_sem);
 
         if (ret < 0)
                 ret = nilfs_bmap_convert_error(bmap, __func__, ret);
-        else
-                *key = lastkey;
         return ret;
 }
 
@@ -224,7 +250,7 @@ int nilfs_bmap_last_key(struct nilfs_bmap *bmap, unsigned long *key)
  *
  * %-ENOENT - A record associated with @key does not exist.
  */
-int nilfs_bmap_delete(struct nilfs_bmap *bmap, unsigned long key)
+int nilfs_bmap_delete(struct nilfs_bmap *bmap, __u64 key)
 {
         int ret;
 
@@ -235,7 +261,7 @@ int nilfs_bmap_delete(struct nilfs_bmap *bmap, unsigned long key)
         return nilfs_bmap_convert_error(bmap, __func__, ret);
 }
 
-static int nilfs_bmap_do_truncate(struct nilfs_bmap *bmap, unsigned long key)
+static int nilfs_bmap_do_truncate(struct nilfs_bmap *bmap, __u64 key)
 {
         __u64 lastkey;
         int ret;
@@ -276,7 +302,7 @@ static int nilfs_bmap_do_truncate(struct nilfs_bmap *bmap, unsigned long key)
  *
  * %-ENOMEM - Insufficient amount of memory available.
  */
-int nilfs_bmap_truncate(struct nilfs_bmap *bmap, unsigned long key)
+int nilfs_bmap_truncate(struct nilfs_bmap *bmap, __u64 key)
 {
         int ret;
 
diff --git a/fs/nilfs2/bmap.h b/fs/nilfs2/bmap.h
index b89e68076adc..bfa817ce40b3 100644
--- a/fs/nilfs2/bmap.h
+++ b/fs/nilfs2/bmap.h
@@ -76,8 +76,10 @@ struct nilfs_bmap_operations {
                           union nilfs_binfo *);
         int (*bop_mark)(struct nilfs_bmap *, __u64, int);
 
-        /* The following functions are internal use only. */
+        int (*bop_seek_key)(const struct nilfs_bmap *, __u64, __u64 *);
         int (*bop_last_key)(const struct nilfs_bmap *, __u64 *);
+
+        /* The following functions are internal use only. */
         int (*bop_check_insert)(const struct nilfs_bmap *, __u64);
         int (*bop_check_delete)(struct nilfs_bmap *, __u64);
         int (*bop_gather_data)(struct nilfs_bmap *, __u64 *, __u64 *, int);
@@ -153,10 +155,11 @@ int nilfs_bmap_test_and_clear_dirty(struct nilfs_bmap *);
 int nilfs_bmap_read(struct nilfs_bmap *, struct nilfs_inode *);
 void nilfs_bmap_write(struct nilfs_bmap *, struct nilfs_inode *);
 int nilfs_bmap_lookup_contig(struct nilfs_bmap *, __u64, __u64 *, unsigned);
-int nilfs_bmap_insert(struct nilfs_bmap *, unsigned long, unsigned long);
-int nilfs_bmap_delete(struct nilfs_bmap *, unsigned long);
-int nilfs_bmap_last_key(struct nilfs_bmap *, unsigned long *);
-int nilfs_bmap_truncate(struct nilfs_bmap *, unsigned long);
+int nilfs_bmap_insert(struct nilfs_bmap *bmap, __u64 key, unsigned long rec);
+int nilfs_bmap_delete(struct nilfs_bmap *bmap, __u64 key);
+int nilfs_bmap_seek_key(struct nilfs_bmap *bmap, __u64 start, __u64 *keyp);
+int nilfs_bmap_last_key(struct nilfs_bmap *bmap, __u64 *keyp);
+int nilfs_bmap_truncate(struct nilfs_bmap *bmap, __u64 key);
 void nilfs_bmap_clear(struct nilfs_bmap *);
 int nilfs_bmap_propagate(struct nilfs_bmap *, struct buffer_head *);
 void nilfs_bmap_lookup_dirty_buffers(struct nilfs_bmap *, struct list_head *);
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index ecdbae19a766..059f37137f9a 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -633,6 +633,44 @@ static int nilfs_btree_do_lookup_last(const struct nilfs_bmap *btree,
         return 0;
 }
 
+/**
+ * nilfs_btree_get_next_key - get next valid key from btree path array
+ * @btree: bmap struct of btree
+ * @path: array of nilfs_btree_path struct
+ * @minlevel: start level
+ * @nextkey: place to store the next valid key
+ *
+ * Return Value: If a next key was found, 0 is returned. Otherwise,
+ * -ENOENT is returned.
+ */
+static int nilfs_btree_get_next_key(const struct nilfs_bmap *btree,
+                                    const struct nilfs_btree_path *path,
+                                    int minlevel, __u64 *nextkey)
+{
+        struct nilfs_btree_node *node;
+        int maxlevel = nilfs_btree_height(btree) - 1;
+        int index, next_adj, level;
+
+        /* Next index is already set to bp_index for leaf nodes. */
+        next_adj = 0;
+        for (level = minlevel; level <= maxlevel; level++) {
+                if (level == maxlevel)
+                        node = nilfs_btree_get_root(btree);
+                else
+                        node = nilfs_btree_get_nonroot_node(path, level);
+
+                index = path[level].bp_index + next_adj;
+                if (index < nilfs_btree_node_get_nchildren(node)) {
+                        /* Next key is in this node */
+                        *nextkey = nilfs_btree_node_get_key(node, index);
+                        return 0;
+                }
+                /* For non-leaf nodes, next index is stored at bp_index + 1. */
+                next_adj = 1;
+        }
+        return -ENOENT;
+}
+
 static int nilfs_btree_lookup(const struct nilfs_bmap *btree,
                               __u64 key, int level, __u64 *ptrp)
 {
@@ -1563,6 +1601,27 @@ out:
         return ret;
 }
 
+static int nilfs_btree_seek_key(const struct nilfs_bmap *btree, __u64 start,
+                                __u64 *keyp)
+{
+        struct nilfs_btree_path *path;
+        const int minlevel = NILFS_BTREE_LEVEL_NODE_MIN;
+        int ret;
+
+        path = nilfs_btree_alloc_path();
+        if (!path)
+                return -ENOMEM;
+
+        ret = nilfs_btree_do_lookup(btree, path, start, NULL, minlevel, 0);
+        if (!ret)
+                *keyp = start;
+        else if (ret == -ENOENT)
+                ret = nilfs_btree_get_next_key(btree, path, minlevel, keyp);
+
+        nilfs_btree_free_path(path);
+        return ret;
+}
+
 static int nilfs_btree_last_key(const struct nilfs_bmap *btree, __u64 *keyp)
 {
         struct nilfs_btree_path *path;
@@ -2298,7 +2357,9 @@ static const struct nilfs_bmap_operations nilfs_btree_ops = {
         .bop_assign             =       nilfs_btree_assign,
         .bop_mark               =       nilfs_btree_mark,
 
+        .bop_seek_key           =       nilfs_btree_seek_key,
         .bop_last_key           =       nilfs_btree_last_key,
+
         .bop_check_insert       =       NULL,
         .bop_check_delete       =       nilfs_btree_check_delete,
         .bop_gather_data        =       nilfs_btree_gather_data,
@@ -2318,7 +2379,9 @@ static const struct nilfs_bmap_operations nilfs_btree_ops_gc = {
         .bop_assign             =       nilfs_btree_assign_gc,
         .bop_mark               =       NULL,
 
+        .bop_seek_key           =       NULL,
         .bop_last_key           =       NULL,
+
         .bop_check_insert       =       NULL,
         .bop_check_delete       =       NULL,
         .bop_gather_data        =       NULL,
diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
index 0d58075f34e2..b6596cab9e99 100644
--- a/fs/nilfs2/cpfile.c
+++ b/fs/nilfs2/cpfile.c
@@ -53,6 +53,13 @@ nilfs_cpfile_get_offset(const struct inode *cpfile, __u64 cno)
         return do_div(tcno, nilfs_cpfile_checkpoints_per_block(cpfile));
 }
 
+static __u64 nilfs_cpfile_first_checkpoint_in_block(const struct inode *cpfile,
+                                                    unsigned long blkoff)
+{
+        return (__u64)nilfs_cpfile_checkpoints_per_block(cpfile) * blkoff
+                + 1 - NILFS_MDT(cpfile)->mi_first_entry_offset;
+}
+
 static unsigned long
 nilfs_cpfile_checkpoints_in_block(const struct inode *cpfile,
                                   __u64 curr,
@@ -146,6 +153,44 @@ static inline int nilfs_cpfile_get_checkpoint_block(struct inode *cpfile,
                                    create, nilfs_cpfile_block_init, bhp);
 }
 
+/**
+ * nilfs_cpfile_find_checkpoint_block - find and get a buffer on cpfile
+ * @cpfile: inode of cpfile
+ * @start_cno: start checkpoint number (inclusive)
+ * @end_cno: end checkpoint number (inclusive)
+ * @cnop: place to store the next checkpoint number
+ * @bhp: place to store a pointer to buffer_head struct
+ *
+ * Return Value: On success, it returns 0. On error, the following negative
+ * error code is returned.
+ *
+ * %-ENOMEM - Insufficient memory available.
+ *
+ * %-EIO - I/O error
+ *
+ * %-ENOENT - no block exists in the range.
+ */
+static int nilfs_cpfile_find_checkpoint_block(struct inode *cpfile,
+                                              __u64 start_cno, __u64 end_cno,
+                                              __u64 *cnop,
+                                              struct buffer_head **bhp)
+{
+        unsigned long start, end, blkoff;
+        int ret;
+
+        if (unlikely(start_cno > end_cno))
+                return -ENOENT;
+
+        start = nilfs_cpfile_get_blkoff(cpfile, start_cno);
+        end = nilfs_cpfile_get_blkoff(cpfile, end_cno);
+
+        ret = nilfs_mdt_find_block(cpfile, start, end, &blkoff, bhp);
+        if (!ret)
+                *cnop = (blkoff == start) ? start_cno :
+                        nilfs_cpfile_first_checkpoint_in_block(cpfile, blkoff);
+        return ret;
+}
+
 static inline int nilfs_cpfile_delete_checkpoint_block(struct inode *cpfile,
                                                        __u64 cno)
 {
@@ -403,14 +448,15 @@ static ssize_t nilfs_cpfile_do_get_cpinfo(struct inode *cpfile, __u64 *cnop,
                 return -ENOENT; /* checkpoint number 0 is invalid */
         down_read(&NILFS_MDT(cpfile)->mi_sem);
 
-        for (n = 0; cno < cur_cno && n < nci; cno += ncps) {
-                ncps = nilfs_cpfile_checkpoints_in_block(cpfile, cno, cur_cno);
-                ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 0, &bh);
+        for (n = 0; n < nci; cno += ncps) {
+                ret = nilfs_cpfile_find_checkpoint_block(
+                        cpfile, cno, cur_cno - 1, &cno, &bh);
                 if (ret < 0) {
-                        if (ret != -ENOENT)
-                                goto out;
-                        continue; /* skip hole */
+                        if (likely(ret == -ENOENT))
+                                break;
+                        goto out;
                 }
+                ncps = nilfs_cpfile_checkpoints_in_block(cpfile, cno, cur_cno);
 
                 kaddr = kmap_atomic(bh->b_page);
                 cp = nilfs_cpfile_block_get_checkpoint(cpfile, cno, bh, kaddr);
diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c
index 82f4865e86dd..ebf89fd8ac1a 100644
--- a/fs/nilfs2/direct.c
+++ b/fs/nilfs2/direct.c
@@ -173,6 +173,21 @@ static int nilfs_direct_delete(struct nilfs_bmap *bmap, __u64 key)
         return ret;
 }
 
+static int nilfs_direct_seek_key(const struct nilfs_bmap *direct, __u64 start,
+                                 __u64 *keyp)
+{
+        __u64 key;
+
+        for (key = start; key <= NILFS_DIRECT_KEY_MAX; key++) {
+                if (nilfs_direct_get_ptr(direct, key) !=
+                    NILFS_BMAP_INVALID_PTR) {
+                        *keyp = key;
+                        return 0;
+                }
+        }
+        return -ENOENT;
+}
+
 static int nilfs_direct_last_key(const struct nilfs_bmap *direct, __u64 *keyp)
 {
         __u64 key, lastkey;
@@ -355,7 +370,9 @@ static const struct nilfs_bmap_operations nilfs_direct_ops = {
         .bop_assign             =       nilfs_direct_assign,
         .bop_mark               =       NULL,
 
+        .bop_seek_key           =       nilfs_direct_seek_key,
         .bop_last_key           =       nilfs_direct_last_key,
+
         .bop_check_insert       =       nilfs_direct_check_insert,
         .bop_check_delete       =       NULL,
         .bop_gather_data        =       nilfs_direct_gather_data,
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index 36f057fa8aa3..be936df4ba73 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -106,7 +106,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff,
                 err = nilfs_transaction_begin(inode->i_sb, &ti, 1);
                 if (unlikely(err))
                         goto out;
-                err = nilfs_bmap_insert(ii->i_bmap, (unsigned long)blkoff,
+                err = nilfs_bmap_insert(ii->i_bmap, blkoff,
                                         (unsigned long)bh_result);
                 if (unlikely(err != 0)) {
                         if (err == -EEXIST) {
@@ -441,21 +441,20 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)
 void nilfs_set_inode_flags(struct inode *inode)
 {
         unsigned int flags = NILFS_I(inode)->i_flags;
+        unsigned int new_fl = 0;
 
-        inode->i_flags &= ~(S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME |
-                            S_DIRSYNC);
         if (flags & FS_SYNC_FL)
-                inode->i_flags |= S_SYNC;
+                new_fl |= S_SYNC;
         if (flags & FS_APPEND_FL)
-                inode->i_flags |= S_APPEND;
+                new_fl |= S_APPEND;
         if (flags & FS_IMMUTABLE_FL)
-                inode->i_flags |= S_IMMUTABLE;
+                new_fl |= S_IMMUTABLE;
         if (flags & FS_NOATIME_FL)
-                inode->i_flags |= S_NOATIME;
+                new_fl |= S_NOATIME;
         if (flags & FS_DIRSYNC_FL)
-                inode->i_flags |= S_DIRSYNC;
-        mapping_set_gfp_mask(inode->i_mapping,
-                             mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS);
+                new_fl |= S_DIRSYNC;
+        inode_set_flags(inode, new_fl, S_SYNC | S_APPEND | S_IMMUTABLE |
+                        S_NOATIME | S_DIRSYNC);
 }
 
 int nilfs_read_inode_common(struct inode *inode,
@@ -540,6 +539,8 @@ static int __nilfs_read_inode(struct super_block *sb,
         brelse(bh);
         up_read(&NILFS_MDT(nilfs->ns_dat)->mi_sem);
         nilfs_set_inode_flags(inode);
+        mapping_set_gfp_mask(inode->i_mapping,
+                             mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS);
         return 0;
 
  failed_unmap:
@@ -712,7 +713,7 @@ void nilfs_update_inode(struct inode *inode, struct buffer_head *ibh, int flags)
 static void nilfs_truncate_bmap(struct nilfs_inode_info *ii,
                                 unsigned long from)
 {
-        unsigned long b;
+        __u64 b;
         int ret;
 
         if (!test_bit(NILFS_I_BMAP, &ii->i_state))
@@ -727,7 +728,7 @@ repeat:
         if (b < from)
                 return;
 
-        b -= min_t(unsigned long, NILFS_MAX_TRUNCATE_BLOCKS, b - from);
+        b -= min_t(__u64, NILFS_MAX_TRUNCATE_BLOCKS, b - from);
         ret = nilfs_bmap_truncate(ii->i_bmap, b);
         nilfs_relax_pressure_in_lock(ii->vfs_inode.i_sb);
         if (!ret || (ret == -ENOMEM &&
diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index 892cf5ffdb8e..dee34d990281 100644
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -261,6 +261,60 @@ int nilfs_mdt_get_block(struct inode *inode, unsigned long blkoff, int create,
 }
 
 /**
+ * nilfs_mdt_find_block - find and get a buffer on meta data file.
+ * @inode: inode of the meta data file
+ * @start: start block offset (inclusive)
+ * @end: end block offset (inclusive)
+ * @blkoff: block offset
+ * @out_bh: place to store a pointer to buffer_head struct
+ *
+ * nilfs_mdt_find_block() looks up an existing block in range of
+ * [@start, @end] and stores pointer to a buffer head of the block to
+ * @out_bh, and block offset to @blkoff, respectively.  @out_bh and
+ * @blkoff are substituted only when zero is returned.
+ *
+ * Return Value: On success, it returns 0. On error, the following negative
+ * error code is returned.
+ *
+ * %-ENOMEM - Insufficient memory available.
+ *
+ * %-EIO - I/O error
+ *
+ * %-ENOENT - no block was found in the range
+ */
+int nilfs_mdt_find_block(struct inode *inode, unsigned long start,
+                         unsigned long end, unsigned long *blkoff,
+                         struct buffer_head **out_bh)
+{
+        __u64 next;
+        int ret;
+
+        if (unlikely(start > end))
+                return -ENOENT;
+
+        ret = nilfs_mdt_read_block(inode, start, true, out_bh);
+        if (!ret) {
+                *blkoff = start;
+                goto out;
+        }
+        if (unlikely(ret != -ENOENT || start == ULONG_MAX))
+                goto out;
+
+        ret = nilfs_bmap_seek_key(NILFS_I(inode)->i_bmap, start + 1, &next);
+        if (!ret) {
+                if (next <= end) {
+                        ret = nilfs_mdt_read_block(inode, next, true, out_bh);
+                        if (!ret)
+                                *blkoff = next;
+                } else {
+                        ret = -ENOENT;
+                }
+        }
+out:
+        return ret;
+}
+
+/**
  * nilfs_mdt_delete_block - make a hole on the meta data file.
  * @inode: inode of the meta data file
  * @block: block offset
diff --git a/fs/nilfs2/mdt.h b/fs/nilfs2/mdt.h
index ab172e8549c5..fe529a87a208 100644
--- a/fs/nilfs2/mdt.h
+++ b/fs/nilfs2/mdt.h
@@ -78,6 +78,9 @@ int nilfs_mdt_get_block(struct inode *, unsigned long, int,
                         void (*init_block)(struct inode *,
                                            struct buffer_head *, void *),
                         struct buffer_head **);
+int nilfs_mdt_find_block(struct inode *inode, unsigned long start,
+                         unsigned long end, unsigned long *blkoff,
+                         struct buffer_head **out_bh);
 int nilfs_mdt_delete_block(struct inode *, unsigned long);
 int nilfs_mdt_forget_block(struct inode *, unsigned long);
 int nilfs_mdt_mark_block_dirty(struct inode *, unsigned long);
@@ -111,7 +114,10 @@ static inline __u64 nilfs_mdt_cno(struct inode *inode)
         return ((struct the_nilfs *)inode->i_sb->s_fs_info)->ns_cno;
 }
 
-#define nilfs_mdt_bgl_lock(inode, bg) \
-        (&NILFS_MDT(inode)->mi_bgl->locks[(bg) & (NR_BG_LOCKS-1)].lock)
+static inline spinlock_t *
+nilfs_mdt_bgl_lock(struct inode *inode, unsigned int block_group)
+{
+        return bgl_lock_ptr(NILFS_MDT(inode)->mi_bgl, block_group);
+}
 
 #endif /* _NILFS_MDT_H */
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index 700ecbcca55d..45d650addd56 100644
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -89,18 +89,16 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode,
 void nilfs_forget_buffer(struct buffer_head *bh)
 {
         struct page *page = bh->b_page;
+        const unsigned long clear_bits =
+                (1 << BH_Uptodate | 1 << BH_Dirty | 1 << BH_Mapped |
+                 1 << BH_Async_Write | 1 << BH_NILFS_Volatile |
+                 1 << BH_NILFS_Checked | 1 << BH_NILFS_Redirected);
 
         lock_buffer(bh);
-        clear_buffer_nilfs_volatile(bh);
-        clear_buffer_nilfs_checked(bh);
-        clear_buffer_nilfs_redirected(bh);
-        clear_buffer_async_write(bh);
-        clear_buffer_dirty(bh);
+        set_mask_bits(&bh->b_state, clear_bits, 0);
         if (nilfs_page_buffers_clean(page))
                 __nilfs_clear_page_dirty(page);
 
-        clear_buffer_uptodate(bh);
-        clear_buffer_mapped(bh);
         bh->b_blocknr = -1;
         ClearPageUptodate(page);
         ClearPageMappedToDisk(page);
@@ -421,6 +419,10 @@ void nilfs_clear_dirty_page(struct page *page, bool silent)
 
         if (page_has_buffers(page)) {
                 struct buffer_head *bh, *head;
+                const unsigned long clear_bits =
+                        (1 << BH_Uptodate | 1 << BH_Dirty | 1 << BH_Mapped |
+                         1 << BH_Async_Write | 1 << BH_NILFS_Volatile |
+                         1 << BH_NILFS_Checked | 1 << BH_NILFS_Redirected);
 
                 bh = head = page_buffers(page);
                 do {
@@ -430,13 +432,7 @@ void nilfs_clear_dirty_page(struct page *page, bool silent)
                                         "discard block %llu, size %zu",
                                         (u64)bh->b_blocknr, bh->b_size);
                         }
-                        clear_buffer_async_write(bh);
-                        clear_buffer_dirty(bh);
-                        clear_buffer_nilfs_volatile(bh);
-                        clear_buffer_nilfs_checked(bh);
-                        clear_buffer_nilfs_redirected(bh);
-                        clear_buffer_uptodate(bh);
-                        clear_buffer_mapped(bh);
+                        set_mask_bits(&bh->b_state, clear_bits, 0);
                         unlock_buffer(bh);
                 } while (bh = bh->b_this_page, bh != head);
         }
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 0c3f303baf32..c6abbad9b8e3 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -24,6 +24,7 @@
 #include <linux/pagemap.h>
 #include <linux/buffer_head.h>
 #include <linux/writeback.h>
+#include <linux/bitops.h>
 #include <linux/bio.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
@@ -1588,7 +1589,6 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci)
 
                 list_for_each_entry(bh, &segbuf->sb_segsum_buffers,
                                     b_assoc_buffers) {
-                        set_buffer_async_write(bh);
                         if (bh->b_page != bd_page) {
                                 if (bd_page) {
                                         lock_page(bd_page);
@@ -1688,7 +1688,6 @@ static void nilfs_abort_logs(struct list_head *logs, int err)
         list_for_each_entry(segbuf, logs, sb_list) {
                 list_for_each_entry(bh, &segbuf->sb_segsum_buffers,
                                     b_assoc_buffers) {
-                        clear_buffer_async_write(bh);
                         if (bh->b_page != bd_page) {
                                 if (bd_page)
                                         end_page_writeback(bd_page);
@@ -1768,7 +1767,6 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci)
                                     b_assoc_buffers) {
                         set_buffer_uptodate(bh);
                         clear_buffer_dirty(bh);
-                        clear_buffer_async_write(bh);
                         if (bh->b_page != bd_page) {
                                 if (bd_page)
                                         end_page_writeback(bd_page);
@@ -1788,12 +1786,13 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci)
                  */
                 list_for_each_entry(bh, &segbuf->sb_payload_buffers,
                                     b_assoc_buffers) {
-                        set_buffer_uptodate(bh);
-                        clear_buffer_dirty(bh);
-                        clear_buffer_async_write(bh);
-                        clear_buffer_delay(bh);
-                        clear_buffer_nilfs_volatile(bh);
-                        clear_buffer_nilfs_redirected(bh);
+                        const unsigned long set_bits = (1 << BH_Uptodate);
+                        const unsigned long clear_bits =
+                                (1 << BH_Dirty | 1 << BH_Async_Write |
+                                 1 << BH_Delay | 1 << BH_NILFS_Volatile |
+                                 1 << BH_NILFS_Redirected);
+
+                        set_mask_bits(&bh->b_state, clear_bits, set_bits);
                         if (bh == segbuf->sb_super_root) {
                                 if (bh->b_page != bd_page) {
                                         end_page_writeback(bd_page);
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 5bc2a1cf73c3..c1725f20a9d1 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -1020,7 +1020,7 @@ int nilfs_checkpoint_is_mounted(struct super_block *sb, __u64 cno)
         struct dentry *dentry;
         int ret;
 
-        if (cno < 0 || cno > nilfs->ns_cno)
+        if (cno > nilfs->ns_cno)
                 return false;
 
         if (cno >= nilfs_last_cno(nilfs))