Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-6.11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fix from David Sterba:
"A fix for build breakage on 32bit platforms"
* tag 'for-6.11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: change BTRFS_MOUNT_* flags to 64bit type
+46
-42
+33
-33
fs/btrfs/fs.h
+33
-33
fs/btrfs/fs.h
···
195
195
* Note: don't forget to add new options to btrfs_show_options()
196
196
*/
197
197
enum {
198
-
BTRFS_MOUNT_NODATASUM = (1UL << 0),
199
-
BTRFS_MOUNT_NODATACOW = (1UL << 1),
200
-
BTRFS_MOUNT_NOBARRIER = (1UL << 2),
201
-
BTRFS_MOUNT_SSD = (1UL << 3),
202
-
BTRFS_MOUNT_DEGRADED = (1UL << 4),
203
-
BTRFS_MOUNT_COMPRESS = (1UL << 5),
204
-
BTRFS_MOUNT_NOTREELOG = (1UL << 6),
205
-
BTRFS_MOUNT_FLUSHONCOMMIT = (1UL << 7),
206
-
BTRFS_MOUNT_SSD_SPREAD = (1UL << 8),
207
-
BTRFS_MOUNT_NOSSD = (1UL << 9),
208
-
BTRFS_MOUNT_DISCARD_SYNC = (1UL << 10),
209
-
BTRFS_MOUNT_FORCE_COMPRESS = (1UL << 11),
210
-
BTRFS_MOUNT_SPACE_CACHE = (1UL << 12),
211
-
BTRFS_MOUNT_CLEAR_CACHE = (1UL << 13),
212
-
BTRFS_MOUNT_USER_SUBVOL_RM_ALLOWED = (1UL << 14),
213
-
BTRFS_MOUNT_ENOSPC_DEBUG = (1UL << 15),
214
-
BTRFS_MOUNT_AUTO_DEFRAG = (1UL << 16),
215
-
BTRFS_MOUNT_USEBACKUPROOT = (1UL << 17),
216
-
BTRFS_MOUNT_SKIP_BALANCE = (1UL << 18),
217
-
BTRFS_MOUNT_PANIC_ON_FATAL_ERROR = (1UL << 19),
218
-
BTRFS_MOUNT_RESCAN_UUID_TREE = (1UL << 20),
219
-
BTRFS_MOUNT_FRAGMENT_DATA = (1UL << 21),
220
-
BTRFS_MOUNT_FRAGMENT_METADATA = (1UL << 22),
221
-
BTRFS_MOUNT_FREE_SPACE_TREE = (1UL << 23),
222
-
BTRFS_MOUNT_NOLOGREPLAY = (1UL << 24),
223
-
BTRFS_MOUNT_REF_VERIFY = (1UL << 25),
224
-
BTRFS_MOUNT_DISCARD_ASYNC = (1UL << 26),
225
-
BTRFS_MOUNT_IGNOREBADROOTS = (1UL << 27),
226
-
BTRFS_MOUNT_IGNOREDATACSUMS = (1UL << 28),
227
-
BTRFS_MOUNT_NODISCARD = (1UL << 29),
228
-
BTRFS_MOUNT_NOSPACECACHE = (1UL << 30),
229
-
BTRFS_MOUNT_IGNOREMETACSUMS = (1UL << 31),
198
+
BTRFS_MOUNT_NODATASUM = (1ULL << 0),
199
+
BTRFS_MOUNT_NODATACOW = (1ULL << 1),
200
+
BTRFS_MOUNT_NOBARRIER = (1ULL << 2),
201
+
BTRFS_MOUNT_SSD = (1ULL << 3),
202
+
BTRFS_MOUNT_DEGRADED = (1ULL << 4),
203
+
BTRFS_MOUNT_COMPRESS = (1ULL << 5),
204
+
BTRFS_MOUNT_NOTREELOG = (1ULL << 6),
205
+
BTRFS_MOUNT_FLUSHONCOMMIT = (1ULL << 7),
206
+
BTRFS_MOUNT_SSD_SPREAD = (1ULL << 8),
207
+
BTRFS_MOUNT_NOSSD = (1ULL << 9),
208
+
BTRFS_MOUNT_DISCARD_SYNC = (1ULL << 10),
209
+
BTRFS_MOUNT_FORCE_COMPRESS = (1ULL << 11),
210
+
BTRFS_MOUNT_SPACE_CACHE = (1ULL << 12),
211
+
BTRFS_MOUNT_CLEAR_CACHE = (1ULL << 13),
212
+
BTRFS_MOUNT_USER_SUBVOL_RM_ALLOWED = (1ULL << 14),
213
+
BTRFS_MOUNT_ENOSPC_DEBUG = (1ULL << 15),
214
+
BTRFS_MOUNT_AUTO_DEFRAG = (1ULL << 16),
215
+
BTRFS_MOUNT_USEBACKUPROOT = (1ULL << 17),
216
+
BTRFS_MOUNT_SKIP_BALANCE = (1ULL << 18),
217
+
BTRFS_MOUNT_PANIC_ON_FATAL_ERROR = (1ULL << 19),
218
+
BTRFS_MOUNT_RESCAN_UUID_TREE = (1ULL << 20),
219
+
BTRFS_MOUNT_FRAGMENT_DATA = (1ULL << 21),
220
+
BTRFS_MOUNT_FRAGMENT_METADATA = (1ULL << 22),
221
+
BTRFS_MOUNT_FREE_SPACE_TREE = (1ULL << 23),
222
+
BTRFS_MOUNT_NOLOGREPLAY = (1ULL << 24),
223
+
BTRFS_MOUNT_REF_VERIFY = (1ULL << 25),
224
+
BTRFS_MOUNT_DISCARD_ASYNC = (1ULL << 26),
225
+
BTRFS_MOUNT_IGNOREBADROOTS = (1ULL << 27),
226
+
BTRFS_MOUNT_IGNOREDATACSUMS = (1ULL << 28),
227
+
BTRFS_MOUNT_NODISCARD = (1ULL << 29),
228
+
BTRFS_MOUNT_NOSPACECACHE = (1ULL << 30),
229
+
BTRFS_MOUNT_IGNOREMETACSUMS = (1ULL << 31),
230
230
BTRFS_MOUNT_IGNORESUPERFLAGS = (1ULL << 32),
231
231
};
232
232
···
481
481
* required instead of the faster short fsync log commits
482
482
*/
483
483
u64 last_trans_log_full_commit;
484
-
unsigned long mount_opt;
484
+
unsigned long long mount_opt;
485
485
486
486
unsigned long compress_type:4;
487
487
unsigned int compress_level;
+6
-5
fs/btrfs/super.c
+6
-5
fs/btrfs/super.c
···
82
82
u32 commit_interval;
83
83
u32 metadata_ratio;
84
84
u32 thread_pool_size;
85
-
unsigned long mount_opt;
85
+
unsigned long long mount_opt;
86
86
unsigned long compress_type:4;
87
87
unsigned int compress_level;
88
88
refcount_t refs;
···
642
642
}
643
643
644
644
static bool check_ro_option(const struct btrfs_fs_info *fs_info,
645
-
unsigned long mount_opt, unsigned long opt,
645
+
unsigned long long mount_opt, unsigned long long opt,
646
646
const char *opt_name)
647
647
{
648
648
if (mount_opt & opt) {
···
653
653
return false;
654
654
}
655
655
656
-
bool btrfs_check_options(const struct btrfs_fs_info *info, unsigned long *mount_opt,
656
+
bool btrfs_check_options(const struct btrfs_fs_info *info,
657
+
unsigned long long *mount_opt,
657
658
unsigned long flags)
658
659
{
659
660
bool ret = true;
···
1232
1231
}
1233
1232
1234
1233
static inline void btrfs_remount_begin(struct btrfs_fs_info *fs_info,
1235
-
unsigned long old_opts, int flags)
1234
+
unsigned long long old_opts, int flags)
1236
1235
{
1237
1236
if (btrfs_raw_test_opt(old_opts, AUTO_DEFRAG) &&
1238
1237
(!btrfs_raw_test_opt(fs_info->mount_opt, AUTO_DEFRAG) ||
···
1246
1245
}
1247
1246
1248
1247
static inline void btrfs_remount_cleanup(struct btrfs_fs_info *fs_info,
1249
-
unsigned long old_opts)
1248
+
unsigned long long old_opts)
1250
1249
{
1251
1250
const bool cache_opt = btrfs_test_opt(fs_info, SPACE_CACHE);
1252
1251
+2
-1
fs/btrfs/super.h
+2
-1
fs/btrfs/super.h
···
10
10
struct super_block;
11
11
struct btrfs_fs_info;
12
12
13
-
bool btrfs_check_options(const struct btrfs_fs_info *info, unsigned long *mount_opt,
13
+
bool btrfs_check_options(const struct btrfs_fs_info *info,
14
+
unsigned long long *mount_opt,
14
15
unsigned long flags);
15
16
int btrfs_sync_fs(struct super_block *sb, int wait);
16
17
char *btrfs_get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
+2
-1
fs/btrfs/zoned.c
+2
-1
fs/btrfs/zoned.c
···
767
767
return 0;
768
768
}
769
769
770
-
int btrfs_check_mountopts_zoned(const struct btrfs_fs_info *info, unsigned long *mount_opt)
770
+
int btrfs_check_mountopts_zoned(const struct btrfs_fs_info *info,
771
+
unsigned long long *mount_opt)
771
772
{
772
773
if (!btrfs_is_zoned(info))
773
774
return 0;
+3
-2
fs/btrfs/zoned.h
+3
-2
fs/btrfs/zoned.h
···
58
58
void btrfs_destroy_dev_zone_info(struct btrfs_device *device);
59
59
struct btrfs_zoned_device_info *btrfs_clone_dev_zone_info(struct btrfs_device *orig_dev);
60
60
int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info);
61
-
int btrfs_check_mountopts_zoned(const struct btrfs_fs_info *info, unsigned long *mount_opt);
61
+
int btrfs_check_mountopts_zoned(const struct btrfs_fs_info *info,
62
+
unsigned long long *mount_opt);
62
63
int btrfs_sb_log_location_bdev(struct block_device *bdev, int mirror, int rw,
63
64
u64 *bytenr_ret);
64
65
int btrfs_sb_log_location(struct btrfs_device *device, int mirror, int rw,
···
131
130
}
132
131
133
132
static inline int btrfs_check_mountopts_zoned(const struct btrfs_fs_info *info,
134
-
unsigned long *mount_opt)
133
+
unsigned long long *mount_opt)
135
134
{
136
135
return 0;
137
136
}