diff --git a/[refs] b/[refs]
index ee7ae0678989..c99c77a93993 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b7128429235d9bd72cfd5ed20c77c4f3118f744
+refs/heads/master: 15ada040d7cd68d7853938a92b116292cc16a2f3
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index 346932e546ba..f3274befd46a 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -184,8 +184,11 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
 				info->max_inline = btrfs_parse_size(num);
 				kfree(num);
 
-				info->max_inline = max_t(u64,
-					info->max_inline, root->sectorsize);
+				if (info->max_inline) {
+					info->max_inline = max_t(u64,
+						info->max_inline,
+						root->sectorsize);
+				}
 				printk(KERN_INFO "btrfs: max_inline at %llu\n",
 					info->max_inline);
 			}