]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jan 2010 20:28:26 +0000 (12:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jan 2010 20:28:26 +0000 (12:28 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: update mailing list address
  nilfs2: Storage class should be before const qualifier
  nilfs2: trivial coding style fix

Documentation/filesystems/nilfs2.txt
MAINTAINERS
fs/nilfs2/bmap.c
fs/nilfs2/cpfile.c
fs/nilfs2/direct.c
fs/nilfs2/ioctl.c

index 4949fcaa6b6a94f6d8b42d483a86c9a5984e0420..839efd8a8a8c19ddce029661e2c166a434f5f080 100644 (file)
@@ -28,7 +28,7 @@ described in the man pages included in the package.
 Project web page:    http://www.nilfs.org/en/
 Download page:       http://www.nilfs.org/en/download.html
 Git tree web page:   http://www.nilfs.org/git/
-NILFS mailing lists: http://www.nilfs.org/mailman/listinfo/users
+List info:           http://vger.kernel.org/vger-lists.html#linux-nilfs
 
 Caveats
 =======
index c22d597e6acec70a34692875e8708eb6e7ffdcac..6914588eef89575ba94ab97d1116f170e4b88bf9 100644 (file)
@@ -3873,7 +3873,7 @@ F:        drivers/net/ni5010.*
 
 NILFS2 FILESYSTEM
 M:     KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
-L:     users@nilfs.org
+L:     linux-nilfs@vger.kernel.org
 W:     http://www.nilfs.org/en/
 S:     Supported
 F:     Documentation/filesystems/nilfs2.txt
index f4a14ea2ed9c3d17f269260affcb82947109ed46..effdbdbe6c117208624c0f03c069d3212fb61e2c 100644 (file)
@@ -417,8 +417,8 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap,
 
        key = page_index(bh->b_page) << (PAGE_CACHE_SHIFT -
                                         bmap->b_inode->i_blkbits);
-       for (pbh = page_buffers(bh->b_page); pbh != bh;
-            pbh = pbh->b_this_page, key++);
+       for (pbh = page_buffers(bh->b_page); pbh != bh; pbh = pbh->b_this_page)
+               key++;
 
        return key;
 }
index d5ad54e204a59f45c181990857d6977cc9b5a73b..18737818db63c63875db8a414e7f415a0217f014 100644 (file)
@@ -328,19 +328,24 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
                        tnicps += nicps;
                        nilfs_mdt_mark_buffer_dirty(cp_bh);
                        nilfs_mdt_mark_dirty(cpfile);
-                       if (!nilfs_cpfile_is_in_first(cpfile, cno) &&
-                           (count = nilfs_cpfile_block_sub_valid_checkpoints(
-                                   cpfile, cp_bh, kaddr, nicps)) == 0) {
-                               /* make hole */
-                               kunmap_atomic(kaddr, KM_USER0);
-                               brelse(cp_bh);
-                               ret = nilfs_cpfile_delete_checkpoint_block(
-                                       cpfile, cno);
-                               if (ret == 0)
-                                       continue;
-                               printk(KERN_ERR "%s: cannot delete block\n",
-                                      __func__);
-                               break;
+                       if (!nilfs_cpfile_is_in_first(cpfile, cno)) {
+                               count =
+                                 nilfs_cpfile_block_sub_valid_checkpoints(
+                                               cpfile, cp_bh, kaddr, nicps);
+                               if (count == 0) {
+                                       /* make hole */
+                                       kunmap_atomic(kaddr, KM_USER0);
+                                       brelse(cp_bh);
+                                       ret =
+                                         nilfs_cpfile_delete_checkpoint_block(
+                                                                  cpfile, cno);
+                                       if (ret == 0)
+                                               continue;
+                                       printk(KERN_ERR
+                                              "%s: cannot delete block\n",
+                                              __func__);
+                                       break;
+                               }
                        }
                }
 
index d369ac7182772b359bc148bd5dc7d7a30d3285d9..236753df5cdf9db2362494aa44d8b20105cfc5fb 100644 (file)
@@ -51,11 +51,11 @@ static int nilfs_direct_lookup(const struct nilfs_bmap *bmap,
        struct nilfs_direct *direct;
        __u64 ptr;
 
-       direct = (struct nilfs_direct *)bmap;
-       if ((key > NILFS_DIRECT_KEY_MAX) ||
-           (level != 1) ||     /* XXX: use macro for level 1 */
-           ((ptr = nilfs_direct_get_ptr(direct, key)) ==
-            NILFS_BMAP_INVALID_PTR))
+       direct = (struct nilfs_direct *)bmap;  /* XXX: use macro for level 1 */
+       if (key > NILFS_DIRECT_KEY_MAX || level != 1)
+               return -ENOENT;
+       ptr = nilfs_direct_get_ptr(direct, key);
+       if (ptr == NILFS_BMAP_INVALID_PTR)
                return -ENOENT;
 
        if (ptrp != NULL)
@@ -73,9 +73,10 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *bmap,
        sector_t blocknr;
        int ret, cnt;
 
-       if (key > NILFS_DIRECT_KEY_MAX ||
-           (ptr = nilfs_direct_get_ptr(direct, key)) ==
-           NILFS_BMAP_INVALID_PTR)
+       if (key > NILFS_DIRECT_KEY_MAX)
+               return -ENOENT;
+       ptr = nilfs_direct_get_ptr(direct, key);
+       if (ptr == NILFS_BMAP_INVALID_PTR)
                return -ENOENT;
 
        if (NILFS_BMAP_USE_VBN(bmap)) {
index f6af76042d80fe8f7278bb2fa791fdc7b2551a21..d6b2b83de3633a7401a8f8720de0e6ec5b4568c7 100644 (file)
@@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
                                      unsigned int cmd, void __user *argp)
 {
        struct nilfs_argv argv[5];
-       const static size_t argsz[5] = {
+       static const size_t argsz[5] = {
                sizeof(struct nilfs_vdesc),
                sizeof(struct nilfs_period),
                sizeof(__u64),