diff options
author | Jiro SEKIBA <jir@unicus.jp> | 2010-02-20 05:47:49 -0500 |
---|---|---|
committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2010-02-20 07:18:19 -0500 |
commit | 0d561f12b490dd2b993d73112d3297007688e6df (patch) | |
tree | 3c754966cb9ec6647048ae2fd41428c9fa4b1b84 /fs/nilfs2/ioctl.c | |
parent | 03f29365e84ff6d651be4e6186e0400ca59da6cd (diff) |
nilfs2: add reader's lock for cno in nilfs_ioctl_sync
This adds reader's lock for the_nilfs->cno in nilfs_ioctl_sync,
for the_nilfs->cno should be proctected by segctor_sem when reading.
Signed-off-by: Jiro SEKIBA <jir@unicus.jp>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs/nilfs2/ioctl.c')
-rw-r--r-- | fs/nilfs2/ioctl.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index 8e5cad020c30..313d0a21da48 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c | |||
@@ -601,13 +601,17 @@ static int nilfs_ioctl_sync(struct inode *inode, struct file *filp, | |||
601 | { | 601 | { |
602 | __u64 cno; | 602 | __u64 cno; |
603 | int ret; | 603 | int ret; |
604 | struct the_nilfs *nilfs; | ||
604 | 605 | ||
605 | ret = nilfs_construct_segment(inode->i_sb); | 606 | ret = nilfs_construct_segment(inode->i_sb); |
606 | if (ret < 0) | 607 | if (ret < 0) |
607 | return ret; | 608 | return ret; |
608 | 609 | ||
609 | if (argp != NULL) { | 610 | if (argp != NULL) { |
610 | cno = NILFS_SB(inode->i_sb)->s_nilfs->ns_cno - 1; | 611 | nilfs = NILFS_SB(inode->i_sb)->s_nilfs; |
612 | down_read(&nilfs->ns_segctor_sem); | ||
613 | cno = nilfs->ns_cno - 1; | ||
614 | up_read(&nilfs->ns_segctor_sem); | ||
611 | if (copy_to_user(argp, &cno, sizeof(cno))) | 615 | if (copy_to_user(argp, &cno, sizeof(cno))) |
612 | return -EFAULT; | 616 | return -EFAULT; |
613 | } | 617 | } |