From 99d2076109912d92c574f7a899317900f3aee597 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 26 Aug 2012 21:00:03 -0400
Subject: [PATCH] --- yaml --- r: 328996 b: refs/heads/master c:
 399c9b862f853f5c33e5a3b1f9a3c2507bdd526b h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/ioctl.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 215789409d6e..fee24afc752a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecaa80fbe589d2638b8a8a075916b1862a1124e2
+refs/heads/master: 399c9b862f853f5c33e5a3b1f9a3c2507bdd526b
diff --git a/trunk/fs/ext4/ioctl.c b/trunk/fs/ext4/ioctl.c
index 7f7dad787603..a0ee682dc394 100644
--- a/trunk/fs/ext4/ioctl.c
+++ b/trunk/fs/ext4/ioctl.c
@@ -258,7 +258,8 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 			       EXT4_FEATURE_RO_COMPAT_BIGALLOC)) {
 			ext4_msg(sb, KERN_ERR,
 				 "Online defrag not supported with bigalloc");
-			return -EOPNOTSUPP;
+			err = -EOPNOTSUPP;
+			goto mext_out;
 		}
 
 		err = mnt_want_write_file(filp);