aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Czerner <lczerner@redhat.com>2010-10-27 21:30:11 -0400
committerTheodore Ts'o <tytso@mit.edu>2010-10-27 21:30:11 -0400
commit367a51a339020ba4d9edb0ce0f21d65bd50b00c9 (patch)
tree696cbb5ca3108cd0cf8a7c3f494947cc9a4179c7
parent77ca6cdf0ab8a42f481ec997911bc89e79138723 (diff)
fs: Add FITRIM ioctl
Adds an filesystem independent ioctl to allow implementation of file system batched discard support. I takes fstrim_range structure as an argument. fstrim_range is definec in the include/fs.h and its definition is as follows. struct fstrim_range { start; len; minlen; } start - first Byte to trim len - number of Bytes to trim from start minlen - minimum extent length to trim, free extents shorter than this number of Bytes will be ignored. This will be rounded up to fs block size. It is also possible to specify NULL as an argument. In this case the arguments will set itself as follows: start = 0; len = ULLONG_MAX; minlen = 0; So it will trim the whole file system at one run. After the FITRIM is done, the number of actually discarded Bytes is stored in fstrim_range.len to give the user better insight on how much storage space has been really released for wear-leveling. Signed-off-by: Lukas Czerner <lczerner@redhat.com> Reviewed-by: Dmitry Monakhov <dmonakhov@openvz.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ioctl.c39
-rw-r--r--include/linux/fs.h8
2 files changed, 47 insertions, 0 deletions
diff --git a/fs/ioctl.c b/fs/ioctl.c
index f855ea4fc888..e92fdbb3bc3a 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -530,6 +530,41 @@ static int ioctl_fsthaw(struct file *filp)
530 return thaw_super(sb); 530 return thaw_super(sb);
531} 531}
532 532
533static int ioctl_fstrim(struct file *filp, void __user *argp)
534{
535 struct super_block *sb = filp->f_path.dentry->d_inode->i_sb;
536 struct fstrim_range range;
537 int ret = 0;
538
539 if (!capable(CAP_SYS_ADMIN))
540 return -EPERM;
541
542 /* If filesystem doesn't support trim feature, return. */
543 if (sb->s_op->trim_fs == NULL)
544 return -EOPNOTSUPP;
545
546 /* If a blockdevice-backed filesystem isn't specified, return EINVAL. */
547 if (sb->s_bdev == NULL)
548 return -EINVAL;
549
550 if (argp == NULL) {
551 range.start = 0;
552 range.len = ULLONG_MAX;
553 range.minlen = 0;
554 } else if (copy_from_user(&range, argp, sizeof(range)))
555 return -EFAULT;
556
557 ret = sb->s_op->trim_fs(sb, &range);
558 if (ret < 0)
559 return ret;
560
561 if ((argp != NULL) &&
562 (copy_to_user(argp, &range, sizeof(range))))
563 return -EFAULT;
564
565 return 0;
566}
567
533/* 568/*
534 * When you add any new common ioctls to the switches above and below 569 * When you add any new common ioctls to the switches above and below
535 * please update compat_sys_ioctl() too. 570 * please update compat_sys_ioctl() too.
@@ -580,6 +615,10 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
580 error = ioctl_fsthaw(filp); 615 error = ioctl_fsthaw(filp);
581 break; 616 break;
582 617
618 case FITRIM:
619 error = ioctl_fstrim(filp, argp);
620 break;
621
583 case FS_IOC_FIEMAP: 622 case FS_IOC_FIEMAP:
584 return ioctl_fiemap(filp, arg); 623 return ioctl_fiemap(filp, arg);
585 624
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 63d069bd80b7..7008268e9b5a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -32,6 +32,12 @@
32#define SEEK_END 2 /* seek relative to end of file */ 32#define SEEK_END 2 /* seek relative to end of file */
33#define SEEK_MAX SEEK_END 33#define SEEK_MAX SEEK_END
34 34
35struct fstrim_range {
36 uint64_t start;
37 uint64_t len;
38 uint64_t minlen;
39};
40
35/* And dynamically-tunable limits and defaults: */ 41/* And dynamically-tunable limits and defaults: */
36struct files_stat_struct { 42struct files_stat_struct {
37 int nr_files; /* read only */ 43 int nr_files; /* read only */
@@ -316,6 +322,7 @@ struct inodes_stat_t {
316#define FIGETBSZ _IO(0x00,2) /* get the block size used for bmap */ 322#define FIGETBSZ _IO(0x00,2) /* get the block size used for bmap */
317#define FIFREEZE _IOWR('X', 119, int) /* Freeze */ 323#define FIFREEZE _IOWR('X', 119, int) /* Freeze */
318#define FITHAW _IOWR('X', 120, int) /* Thaw */ 324#define FITHAW _IOWR('X', 120, int) /* Thaw */
325#define FITRIM _IOWR('X', 121, struct fstrim_range) /* Trim */
319 326
320#define FS_IOC_GETFLAGS _IOR('f', 1, long) 327#define FS_IOC_GETFLAGS _IOR('f', 1, long)
321#define FS_IOC_SETFLAGS _IOW('f', 2, long) 328#define FS_IOC_SETFLAGS _IOW('f', 2, long)
@@ -1581,6 +1588,7 @@ struct super_operations {
1581 ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); 1588 ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
1582#endif 1589#endif
1583 int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); 1590 int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
1591 int (*trim_fs) (struct super_block *, struct fstrim_range *);
1584}; 1592};
1585 1593
1586/* 1594/*