tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

fs: remove sb->s_mode

There is no real need to store the open mode in the super_block now.
It is only used by f2fs, which can easily recalculate it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Christian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20230608110258.189493-18-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe 81b1fb7d 3f0b3e78

+6 -8
+6 -4
fs/f2fs/super.c
··· 3993 3993 struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi); 3994 3994 unsigned int max_devices = MAX_DEVICES; 3995 3995 unsigned int logical_blksize; 3996 + fmode_t mode = sb_open_mode(sbi->sb->s_flags); 3996 3997 int i; 3997 3998 3998 3999 /* Initialize single device information */ ··· 4025 4024 if (max_devices == 1) { 4026 4025 /* Single zoned block device mount */ 4027 4026 FDEV(0).bdev = 4028 - blkdev_get_by_dev(sbi->sb->s_bdev->bd_dev, 4029 - sbi->sb->s_mode, sbi->sb->s_type, NULL); 4027 + blkdev_get_by_dev(sbi->sb->s_bdev->bd_dev, mode, 4028 + sbi->sb->s_type, NULL); 4030 4029 } else { 4031 4030 /* Multi-device mount */ 4032 4031 memcpy(FDEV(i).path, RDEV(i).path, MAX_PATH_LEN); ··· 4044 4043 (FDEV(i).total_segments << 4045 4044 sbi->log_blocks_per_seg) - 1; 4046 4045 } 4047 - FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path, 4048 - sbi->sb->s_mode, sbi->sb->s_type, NULL); 4046 + FDEV(i).bdev = blkdev_get_by_path(FDEV(i).path, mode, 4047 + sbi->sb->s_type, 4048 + NULL); 4049 4049 } 4050 4050 if (IS_ERR(FDEV(i).bdev)) 4051 4051 return PTR_ERR(FDEV(i).bdev);
-1
fs/nilfs2/super.c
··· 1316 1316 s_new = true; 1317 1317 1318 1318 /* New superblock instance created */ 1319 - s->s_mode = mode; 1320 1319 snprintf(s->s_id, sizeof(s->s_id), "%pg", sd.bdev); 1321 1320 sb_set_blocksize(s, block_size(sd.bdev)); 1322 1321
-2
fs/super.c
··· 1308 1308 blkdev_put(bdev, fc->fs_type); 1309 1309 down_write(&s->s_umount); 1310 1310 } else { 1311 - s->s_mode = mode; 1312 1311 snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev); 1313 1312 shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s", 1314 1313 fc->fs_type->name, s->s_id); ··· 1381 1382 blkdev_put(bdev, fs_type); 1382 1383 down_write(&s->s_umount); 1383 1384 } else { 1384 - s->s_mode = mode; 1385 1385 snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev); 1386 1386 shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s", 1387 1387 fs_type->name, s->s_id);
-1
include/linux/fs.h
··· 1215 1215 uuid_t s_uuid; /* UUID */ 1216 1216 1217 1217 unsigned int s_max_links; 1218 - fmode_t s_mode; 1219 1218 1220 1219 /* 1221 1220 * The next field is for VFS *only*. No filesystems have any business