evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2010-01-04 12:28:26 -08:00
commit a87da40875
6 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/filesystems/nilfs2.txt
View file

@ -28,7 +28,7 @@ described in the man pages included in the package.
Project web page: http://www.nilfs.org/en/ Project web page: http://www.nilfs.org/en/
Download page: http://www.nilfs.org/en/download.html Download page: http://www.nilfs.org/en/download.html
Git tree web page: http://www.nilfs.org/git/ 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 Caveats
======= =======

2
MAINTAINERS
View file

@ -3873,7 +3873,7 @@ F: drivers/net/ni5010.*
NILFS2 FILESYSTEM NILFS2 FILESYSTEM
M: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp> 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/ W: http://www.nilfs.org/en/
S: Supported S: Supported
F: Documentation/filesystems/nilfs2.txt F: Documentation/filesystems/nilfs2.txt

4
fs/nilfs2/bmap.c
View 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 - key = page_index(bh->b_page) << (PAGE_CACHE_SHIFT -
bmap->b_inode->i_blkbits); bmap->b_inode->i_blkbits);
for (pbh = page_buffers(bh->b_page); pbh != bh; for (pbh = page_buffers(bh->b_page); pbh != bh; pbh = pbh->b_this_page)
pbh = pbh->b_this_page, key++); key++;
return key; return key;
} }

31
fs/nilfs2/cpfile.c
View file

@ -328,19 +328,24 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
tnicps += nicps; tnicps += nicps;
nilfs_mdt_mark_buffer_dirty(cp_bh); nilfs_mdt_mark_buffer_dirty(cp_bh);
nilfs_mdt_mark_dirty(cpfile); nilfs_mdt_mark_dirty(cpfile);
if (!nilfs_cpfile_is_in_first(cpfile, cno) && if (!nilfs_cpfile_is_in_first(cpfile, cno)) {
(count = nilfs_cpfile_block_sub_valid_checkpoints( count =
cpfile, cp_bh, kaddr, nicps)) == 0) { nilfs_cpfile_block_sub_valid_checkpoints(
/* make hole */ cpfile, cp_bh, kaddr, nicps);
kunmap_atomic(kaddr, KM_USER0); if (count == 0) {
brelse(cp_bh); /* make hole */
ret = nilfs_cpfile_delete_checkpoint_block( kunmap_atomic(kaddr, KM_USER0);
cpfile, cno); brelse(cp_bh);
if (ret == 0) ret =
continue; nilfs_cpfile_delete_checkpoint_block(
printk(KERN_ERR "%s: cannot delete block\n", cpfile, cno);
__func__); if (ret == 0)
break; continue;
printk(KERN_ERR
"%s: cannot delete block\n",
__func__);
break;
}
} }
} }

17
fs/nilfs2/direct.c
View file

@ -51,11 +51,11 @@ static int nilfs_direct_lookup(const struct nilfs_bmap *bmap,
struct nilfs_direct *direct; struct nilfs_direct *direct;
__u64 ptr; __u64 ptr;
direct = (struct nilfs_direct *)bmap; direct = (struct nilfs_direct *)bmap; /* XXX: use macro for level 1 */
if ((key > NILFS_DIRECT_KEY_MAX) || if (key > NILFS_DIRECT_KEY_MAX || level != 1)
(level != 1) || /* XXX: use macro for level 1 */ return -ENOENT;
((ptr = nilfs_direct_get_ptr(direct, key)) == ptr = nilfs_direct_get_ptr(direct, key);
NILFS_BMAP_INVALID_PTR)) if (ptr == NILFS_BMAP_INVALID_PTR)
return -ENOENT; return -ENOENT;
if (ptrp != NULL) if (ptrp != NULL)
@ -73,9 +73,10 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *bmap,
sector_t blocknr; sector_t blocknr;
int ret, cnt; int ret, cnt;
if (key > NILFS_DIRECT_KEY_MAX || if (key > NILFS_DIRECT_KEY_MAX)
(ptr = nilfs_direct_get_ptr(direct, key)) == return -ENOENT;
NILFS_BMAP_INVALID_PTR) ptr = nilfs_direct_get_ptr(direct, key);
if (ptr == NILFS_BMAP_INVALID_PTR)
return -ENOENT; return -ENOENT;
if (NILFS_BMAP_USE_VBN(bmap)) { if (NILFS_BMAP_USE_VBN(bmap)) {

2
fs/nilfs2/ioctl.c
View file

@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
unsigned int cmd, void __user *argp) unsigned int cmd, void __user *argp)
{ {
struct nilfs_argv argv[5]; struct nilfs_argv argv[5];
const static size_t argsz[5] = { static const size_t argsz[5] = {
sizeof(struct nilfs_vdesc), sizeof(struct nilfs_vdesc),
sizeof(struct nilfs_period), sizeof(struct nilfs_period),
sizeof(__u64), sizeof(__u64),