Skip to content

Commit 1f5fa4b

Browse files
Nekunaalexandrovich
authored andcommitted
fs/ntfs3: Add ioctl operation for directories (FITRIM)
While ntfs3 supports discards, FITRIM ioctl() command has defined only for regular files. This may confuse users trying to invoke `fstrim` utility with the directory argument (for example, call `fstrim <mountpoint>` which is the common practice). In this case, ioctl() returns -ENOTTY without any error messages in kernel ring buffer, this may be easily interpreted as no support for discards in ntfs3 driver. Currently only FITRIM command implemented in ntfs_ioctl() and passed inode used only for dereferencing NTFS superblock, so no need for separate ioctl() handler for directories, just add existing ntfs_ioctl() handler to ntfs_dir_operations. Signed-off-by: Nekun <nekokun@firemail.cc> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
1 parent 731ab1f commit 1f5fa4b

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

fs/ntfs3/dir.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,5 +611,9 @@ const struct file_operations ntfs_dir_operations = {
611611
.iterate_shared = ntfs_readdir,
612612
.fsync = generic_file_fsync,
613613
.open = ntfs_file_open,
614+
.unlocked_ioctl = ntfs_ioctl,
615+
#ifdef CONFIG_COMPAT
616+
.compat_ioctl = ntfs_compat_ioctl,
617+
#endif
614618
};
615619
// clang-format on

fs/ntfs3/file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static int ntfs_ioctl_fitrim(struct ntfs_sb_info *sbi, unsigned long arg)
4848
return 0;
4949
}
5050

51-
static long ntfs_ioctl(struct file *filp, u32 cmd, unsigned long arg)
51+
long ntfs_ioctl(struct file *filp, u32 cmd, unsigned long arg)
5252
{
5353
struct inode *inode = file_inode(filp);
5454
struct ntfs_sb_info *sbi = inode->i_sb->s_fs_info;
@@ -61,7 +61,7 @@ static long ntfs_ioctl(struct file *filp, u32 cmd, unsigned long arg)
6161
}
6262

6363
#ifdef CONFIG_COMPAT
64-
static long ntfs_compat_ioctl(struct file *filp, u32 cmd, unsigned long arg)
64+
long ntfs_compat_ioctl(struct file *filp, u32 cmd, unsigned long arg)
6565

6666
{
6767
return ntfs_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));

fs/ntfs3/ntfs_fs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,8 @@ int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
502502
int ntfs_file_open(struct inode *inode, struct file *file);
503503
int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
504504
__u64 start, __u64 len);
505+
long ntfs_ioctl(struct file *filp, u32 cmd, unsigned long arg);
506+
long ntfs_compat_ioctl(struct file *filp, u32 cmd, unsigned long arg);
505507
extern const struct inode_operations ntfs_special_inode_operations;
506508
extern const struct inode_operations ntfs_file_inode_operations;
507509
extern const struct file_operations ntfs_file_operations;

0 commit comments

Comments
 (0)