diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-08 09:49:43 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-08 09:49:43 (GMT) |
| commit | 56d94d70398f0fbb1863a03a145db1a86f009a71 (patch) | |
| tree | 9e52dc537f8f8359c70b66f5000192bb280b41b9 /fs/ext4/ioctl.c | |
| parent | bb63f726f98bec032c7322a9c36eb4167307d856 (diff) | |
| parent | fc4f000bf8c0cbf38f44de6bd5e225574e572ed4 (diff) | |
| download | linux-56d94d70398f0fbb1863a03a145db1a86f009a71.tar.xz | |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'fs/ext4/ioctl.c')
| -rw-r--r-- | fs/ext4/ioctl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 0f6c369..eae5917 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -208,7 +208,7 @@ static int ext4_ioctl_setflags(struct inode *inode, { struct ext4_inode_info *ei = EXT4_I(inode); handle_t *handle = NULL; - int err = EPERM, migrate = 0; + int err = -EPERM, migrate = 0; struct ext4_iloc iloc; unsigned int oldflags, mask, i; unsigned int jflag; @@ -583,6 +583,11 @@ group_extend_out: "Online defrag not supported with bigalloc"); err = -EOPNOTSUPP; goto mext_out; + } else if (IS_DAX(inode)) { + ext4_msg(sb, KERN_ERR, + "Online defrag not supported with DAX"); + err = -EOPNOTSUPP; + goto mext_out; } err = mnt_want_write_file(filp); |