Skip to content

Commit 53a5182

Browse files
torvaldstorvalds
committed
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
2 parents 33cf098 + c3ece6b commit 53a5182

File tree

5 files changed

+46
-42
lines changed

5 files changed

+46
-42
lines changed

‎fs/btrfs/fs.h‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -195,38 +195,38 @@ enum {
195195
* Note: don't forget to add new options to btrfs_show_options()
196196
*/
197197
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),
230230
BTRFS_MOUNT_IGNORESUPERFLAGS = (1ULL << 32),
231231
};
232232

@@ -481,7 +481,7 @@ struct btrfs_fs_info {
481481
* required instead of the faster short fsync log commits
482482
*/
483483
u64 last_trans_log_full_commit;
484-
unsigned long mount_opt;
484+
unsigned long long mount_opt;
485485

486486
unsigned long compress_type:4;
487487
unsigned int compress_level;

‎fs/btrfs/super.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ struct btrfs_fs_context {
8282
u32 commit_interval;
8383
u32 metadata_ratio;
8484
u32 thread_pool_size;
85-
unsigned long mount_opt;
85+
unsigned long long mount_opt;
8686
unsigned long compress_type:4;
8787
unsigned int compress_level;
8888
refcount_t refs;
@@ -642,7 +642,7 @@ static void btrfs_clear_oneshot_options(struct btrfs_fs_info *fs_info)
642642
}
643643

644644
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,
646646
const char *opt_name)
647647
{
648648
if (mount_opt & opt) {
@@ -653,7 +653,8 @@ static bool check_ro_option(const struct btrfs_fs_info *fs_info,
653653
return false;
654654
}
655655

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,
657658
unsigned long flags)
658659
{
659660
bool ret = true;
@@ -1231,7 +1232,7 @@ static void btrfs_resize_thread_pool(struct btrfs_fs_info *fs_info,
12311232
}
12321233

12331234
static inline void btrfs_remount_begin(struct btrfs_fs_info *fs_info,
1234-
unsigned long old_opts, int flags)
1235+
unsigned long long old_opts, int flags)
12351236
{
12361237
if (btrfs_raw_test_opt(old_opts, AUTO_DEFRAG) &&
12371238
(!btrfs_raw_test_opt(fs_info->mount_opt, AUTO_DEFRAG) ||
@@ -1245,7 +1246,7 @@ static inline void btrfs_remount_begin(struct btrfs_fs_info *fs_info,
12451246
}
12461247

12471248
static inline void btrfs_remount_cleanup(struct btrfs_fs_info *fs_info,
1248-
unsigned long old_opts)
1249+
unsigned long long old_opts)
12491250
{
12501251
const bool cache_opt = btrfs_test_opt(fs_info, SPACE_CACHE);
12511252

‎fs/btrfs/super.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
struct super_block;
1111
struct btrfs_fs_info;
1212

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,
1415
unsigned long flags);
1516
int btrfs_sync_fs(struct super_block *sb, int wait);
1617
char *btrfs_get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,

‎fs/btrfs/zoned.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,8 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)
767767
return 0;
768768
}
769769

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)
771772
{
772773
if (!btrfs_is_zoned(info))
773774
return 0;

‎fs/btrfs/zoned.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache);
5858
void btrfs_destroy_dev_zone_info(struct btrfs_device *device);
5959
struct btrfs_zoned_device_info *btrfs_clone_dev_zone_info(struct btrfs_device *orig_dev);
6060
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);
6263
int btrfs_sb_log_location_bdev(struct block_device *bdev, int mirror, int rw,
6364
u64 *bytenr_ret);
6465
int btrfs_sb_log_location(struct btrfs_device *device, int mirror, int rw,
@@ -130,7 +131,7 @@ static inline int btrfs_check_zoned_mode(const struct btrfs_fs_info *fs_info)
130131
}
131132

132133
static inline int btrfs_check_mountopts_zoned(const struct btrfs_fs_info *info,
133-
unsigned long *mount_opt)
134+
unsigned long long *mount_opt)
134135
{
135136
return 0;
136137
}

0 commit comments

Comments
 (0)