diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /fs/nilfs2/ioctl.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'fs/nilfs2/ioctl.c')
| -rw-r--r-- | fs/nilfs2/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index f6af76042d80..d6b2b83de363 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c | |||
| @@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp, | |||
| 480 | unsigned int cmd, void __user *argp) | 480 | unsigned int cmd, void __user *argp) |
| 481 | { | 481 | { |
| 482 | struct nilfs_argv argv[5]; | 482 | struct nilfs_argv argv[5]; |
| 483 | const static size_t argsz[5] = { | 483 | static const size_t argsz[5] = { |
| 484 | sizeof(struct nilfs_vdesc), | 484 | sizeof(struct nilfs_vdesc), |
| 485 | sizeof(struct nilfs_period), | 485 | sizeof(struct nilfs_period), |
| 486 | sizeof(__u64), | 486 | sizeof(__u64), |