浏览代码

Btrfs: Fix mount -o max_inline=0

max_inline=0 used to force the max_inline size to one sector instead.  Now
it properly disables inline data items, while still being able to read
any that happen to exist on disk.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Chris Mason 17 年之前
父节点
当前提交
15ada040d7
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      fs/btrfs/super.c

+ 5 - 2
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);
 				info->max_inline = btrfs_parse_size(num);
 				kfree(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",
 				printk(KERN_INFO "btrfs: max_inline at %llu\n",
 					info->max_inline);
 					info->max_inline);
 			}
 			}