From patchwork Sun Jun 28 13:16:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikulas Patocka X-Patchwork-Id: 6686181 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 77EA39F1C1 for ; Sun, 28 Jun 2015 13:27:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07ACD20551 for ; Sun, 28 Jun 2015 13:27:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD7D32054B for ; Sun, 28 Jun 2015 13:27:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752630AbbF1N1P (ORCPT ); Sun, 28 Jun 2015 09:27:15 -0400 Received: from 78-80-28-91.tmcz.cz ([78.80.28.91]:45480 "EHLO leontynka.twibright.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752143AbbF1N06 (ORCPT ); Sun, 28 Jun 2015 09:26:58 -0400 Received: from mikulas (helo=localhost) by leontynka.twibright.com with local-esmtp (Exim 4.72) (envelope-from ) id 1Z9CS9-0007fN-QE; Sun, 28 Jun 2015 15:16:57 +0200 Date: Sun, 28 Jun 2015 15:16:57 +0200 (CEST) From: Mikulas Patocka X-X-Sender: mikulas@leontynka To: Linus Torvalds cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH] hpfs: add fstrim support Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support for fstrim to the HPFS filesystem. Signed-off-by: Mikulas Patocka --- fs/hpfs/alloc.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/hpfs/dir.c | 4 ++ fs/hpfs/file.c | 4 ++ fs/hpfs/hpfs_fn.h | 7 +++ fs/hpfs/super.c | 35 +++++++++++++++++++ 5 files changed, 145 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-4.1-rc1/fs/hpfs/dir.c =================================================================== --- linux-4.1-rc1.orig/fs/hpfs/dir.c 2014-07-01 18:49:25.000000000 +0200 +++ linux-4.1-rc1/fs/hpfs/dir.c 2015-05-01 15:52:29.000000000 +0200 @@ -327,4 +327,8 @@ const struct file_operations hpfs_dir_op .iterate = hpfs_readdir, .release = hpfs_dir_release, .fsync = hpfs_file_fsync, + .unlocked_ioctl = hpfs_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = hpfs_compat_ioctl, +#endif }; Index: linux-4.1-rc1/fs/hpfs/file.c =================================================================== --- linux-4.1-rc1.orig/fs/hpfs/file.c 2015-05-01 12:31:01.000000000 +0200 +++ linux-4.1-rc1/fs/hpfs/file.c 2015-05-01 15:52:29.000000000 +0200 @@ -203,6 +203,10 @@ const struct file_operations hpfs_file_o .release = hpfs_file_release, .fsync = hpfs_file_fsync, .splice_read = generic_file_splice_read, + .unlocked_ioctl = hpfs_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = hpfs_compat_ioctl, +#endif }; const struct inode_operations hpfs_file_iops = Index: linux-4.1-rc1/fs/hpfs/alloc.c =================================================================== --- linux-4.1-rc1.orig/fs/hpfs/alloc.c 2014-07-01 18:49:25.000000000 +0200 +++ linux-4.1-rc1/fs/hpfs/alloc.c 2015-05-01 15:52:29.000000000 +0200 @@ -484,3 +484,98 @@ struct anode *hpfs_alloc_anode(struct su a->btree.first_free = cpu_to_le16(8); return a; } + +static unsigned find_run(__le32 *bmp, unsigned *idx) +{ + unsigned len; + while (tstbits(bmp, *idx, 1)) { + (*idx)++; + if (unlikely(*idx >= 0x4000)) + return 0; + } + len = 1; + while (!tstbits(bmp, *idx + len, 1)) + len++; + return len; +} + +static int do_trim(struct super_block *s, secno start, unsigned len, secno limit_start, secno limit_end, unsigned minlen, unsigned *result) +{ + int err; + secno end; + if (fatal_signal_pending(current)) + return -EINTR; + end = start + len; + if (start < limit_start) + start = limit_start; + if (end > limit_end) + end = limit_end; + if (start >= end) + return 0; + if (end - start < minlen) + return 0; + err = sb_issue_discard(s, start, end - start, GFP_NOFS, 0); + if (err) + return err; + *result += end - start; + return 0; +} + +int hpfs_trim_fs(struct super_block *s, u64 start, u64 end, u64 minlen, unsigned *result) +{ + int err = 0; + struct hpfs_sb_info *sbi = hpfs_sb(s); + unsigned idx, len, start_bmp, end_bmp; + __le32 *bmp; + struct quad_buffer_head qbh; + + *result = 0; + if (!end || end > sbi->sb_fs_size) + end = sbi->sb_fs_size; + if (start >= sbi->sb_fs_size) + return 0; + if (minlen > 0x4000) + return 0; + if (start < sbi->sb_dirband_start + sbi->sb_dirband_size && end > sbi->sb_dirband_start) { + hpfs_lock(s); + if (s->s_flags & MS_RDONLY) { + err = -EROFS; + goto unlock_1; + } + if (!(bmp = hpfs_map_dnode_bitmap(s, &qbh))) { + err = -EIO; + goto unlock_1; + } + idx = 0; + while ((len = find_run(bmp, &idx)) && !err) { + err = do_trim(s, sbi->sb_dirband_start + idx * 4, len * 4, start, end, minlen, result); + idx += len; + } + hpfs_brelse4(&qbh); +unlock_1: + hpfs_unlock(s); + } + start_bmp = start >> 14; + end_bmp = (end + 0x3fff) >> 14; + while (start_bmp < end_bmp && !err) { + hpfs_lock(s); + if (s->s_flags & MS_RDONLY) { + err = -EROFS; + goto unlock_2; + } + if (!(bmp = hpfs_map_bitmap(s, start_bmp, &qbh, "trim"))) { + err = -EIO; + goto unlock_2; + } + idx = 0; + while ((len = find_run(bmp, &idx)) && !err) { + err = do_trim(s, (start_bmp << 14) + idx, len, start, end, minlen, result); + idx += len; + } + hpfs_brelse4(&qbh); +unlock_2: + hpfs_unlock(s); + start_bmp++; + } + return err; +} Index: linux-4.1-rc1/fs/hpfs/hpfs_fn.h =================================================================== --- linux-4.1-rc1.orig/fs/hpfs/hpfs_fn.h 2014-07-01 18:49:25.000000000 +0200 +++ linux-4.1-rc1/fs/hpfs/hpfs_fn.h 2015-05-01 15:52:29.000000000 +0200 @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include "hpfs.h" @@ -200,6 +202,7 @@ void hpfs_free_dnode(struct super_block struct dnode *hpfs_alloc_dnode(struct super_block *, secno, dnode_secno *, struct quad_buffer_head *); struct fnode *hpfs_alloc_fnode(struct super_block *, secno, fnode_secno *, struct buffer_head **); struct anode *hpfs_alloc_anode(struct super_block *, secno, anode_secno *, struct buffer_head **); +int hpfs_trim_fs(struct super_block *, u64, u64, u64, unsigned *); /* anode.c */ @@ -318,6 +321,10 @@ __printf(2, 3) void hpfs_error(struct super_block *, const char *, ...); int hpfs_stop_cycles(struct super_block *, int, int *, int *, char *); unsigned hpfs_get_free_dnodes(struct super_block *); +long hpfs_ioctl(struct file *file, unsigned cmd, unsigned long arg); +#ifdef CONFIG_COMPAT +long hpfs_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg); +#endif /* * local time (HPFS) to GMT (Unix) Index: linux-4.1-rc1/fs/hpfs/super.c =================================================================== --- linux-4.1-rc1.orig/fs/hpfs/super.c 2015-05-01 12:58:39.000000000 +0200 +++ linux-4.1-rc1/fs/hpfs/super.c 2015-05-01 16:02:53.000000000 +0200 @@ -15,6 +15,7 @@ #include #include #include +#include /* Mark the filesystem dirty, so that chkdsk checks it when os/2 booted */ @@ -198,6 +199,40 @@ static int hpfs_statfs(struct dentry *de return 0; } + +long hpfs_ioctl(struct file *file, unsigned cmd, unsigned long arg) +{ + switch (cmd) { + case FITRIM: { + struct fstrim_range range; + secno n_trimmed; + int r; + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + if (copy_from_user(&range, (struct fstrim_range __user *)arg, sizeof(range))) + return -EFAULT; + r = hpfs_trim_fs(file_inode(file)->i_sb, range.start >> 9, (range.start + range.len) >> 9, (range.minlen + 511) >> 9, &n_trimmed); + if (r) + return r; + range.len = (u64)n_trimmed << 9; + if (copy_to_user((struct fstrim_range __user *)arg, &range, sizeof(range))) + return -EFAULT; + return 0; + } + default: { + return -ENOIOCTLCMD; + } + } +} + +#ifdef CONFIG_COMPAT +long hpfs_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg) +{ + return hpfs_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); +} +#endif + + static struct kmem_cache * hpfs_inode_cachep; static struct inode *hpfs_alloc_inode(struct super_block *sb)