Skip to content

L
linux
Commit d8f94035 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files
Options

Access sysvfs superblock fields through SYSV_SB() abstraction.

parent 085c9a18
Expand all Show whitespace changes
Inline Side-by-side
Showing with 331 additions and 324 deletions
fs/sysv/balloc.c
View file @ d8f94035
...@@ -31,7 +31,7 @@ static inline u32 *get_chunk(struct super_block *sb, struct buffer_head *bh) ...@@ -31,7 +31,7 @@ static inline u32 *get_chunk(struct super_block *sb, struct buffer_head *bh)
{ {
char *bh_data = bh->b_data; char *bh_data = bh->b_data;
if (sb->sv_type == FSTYPE_SYSV4) if (SYSV_SB(sb)->s_type == FSTYPE_SYSV4)
return (u32*)(bh_data+4); return (u32*)(bh_data+4);
else else
return (u32*)(bh_data+2); return (u32*)(bh_data+2);
...@@ -41,28 +41,29 @@ static inline u32 *get_chunk(struct super_block *sb, struct buffer_head *bh) ...@@ -41,28 +41,29 @@ static inline u32 *get_chunk(struct super_block *sb, struct buffer_head *bh)
void sysv_free_block(struct super_block * sb, u32 nr) void sysv_free_block(struct super_block * sb, u32 nr)
{ {
struct sysv_sb_info * sbi = SYSV_SB(sb);
struct buffer_head * bh; struct buffer_head * bh;
u32 *blocks = sb->sv_bcache; u32 *blocks = sbi->s_bcache;
unsigned count; unsigned count;
unsigned block = fs32_to_cpu(sb, nr); unsigned block = fs32_to_cpu(sbi, nr);
/* /*
* This code does not work at all for AFS (it has a bitmap * This code does not work at all for AFS (it has a bitmap
* free list). As AFS is supposed to be read-only no one * free list). As AFS is supposed to be read-only no one
* should call this for an AFS filesystem anyway... * should call this for an AFS filesystem anyway...
*/ */
if (sb->sv_type == FSTYPE_AFS) if (sbi->s_type == FSTYPE_AFS)
return; return;
if (block < sb->sv_firstdatazone || block >= sb->sv_nzones) { if (block < sbi->s_firstdatazone || block >= sbi->s_nzones) {
printk("sysv_free_block: trying to free block not in datazone\n"); printk("sysv_free_block: trying to free block not in datazone\n");
return; return;
} }
lock_super(sb); lock_super(sb);
count = fs16_to_cpu(sb, *sb->sv_bcache_count); count = fs16_to_cpu(sbi, *sbi->s_bcache_count);
if (count > sb->sv_flc_size) { if (count > sbi->s_flc_size) {
printk("sysv_free_block: flc_count > flc_size\n"); printk("sysv_free_block: flc_count > flc_size\n");
unlock_super(sb); unlock_super(sb);
return; return;
...@@ -71,8 +72,8 @@ void sysv_free_block(struct super_block * sb, u32 nr) ...@@ -71,8 +72,8 @@ void sysv_free_block(struct super_block * sb, u32 nr)
* into this block being freed, ditto if it's completely empty * into this block being freed, ditto if it's completely empty
* (applies only on Coherent). * (applies only on Coherent).
*/ */
if (count == sb->sv_flc_size || count == 0) { if (count == sbi->s_flc_size || count == 0) {
block += sb->sv_block_base; block += sbi->s_block_base;
bh = sb_getblk(sb, block); bh = sb_getblk(sb, block);
if (!bh) { if (!bh) {
printk("sysv_free_block: getblk() failed\n"); printk("sysv_free_block: getblk() failed\n");
...@@ -80,42 +81,43 @@ void sysv_free_block(struct super_block * sb, u32 nr) ...@@ -80,42 +81,43 @@ void sysv_free_block(struct super_block * sb, u32 nr)
return; return;
} }
memset(bh->b_data, 0, sb->s_blocksize); memset(bh->b_data, 0, sb->s_blocksize);
*(u16*)bh->b_data = cpu_to_fs16(sb, count); *(u16*)bh->b_data = cpu_to_fs16(sbi, count);
memcpy(get_chunk(sb,bh), blocks, count * sizeof(sysv_zone_t)); memcpy(get_chunk(sb,bh), blocks, count * sizeof(sysv_zone_t));
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
mark_buffer_uptodate(bh, 1); mark_buffer_uptodate(bh, 1);
brelse(bh); brelse(bh);
count = 0; count = 0;
} }
sb->sv_bcache[count++] = nr; sbi->s_bcache[count++] = nr;
*sb->sv_bcache_count = cpu_to_fs16(sb, count); *sbi->s_bcache_count = cpu_to_fs16(sbi, count);
fs32_add(sb, sb->sv_free_blocks, 1); fs32_add(sbi, sbi->s_free_blocks, 1);
dirty_sb(sb); dirty_sb(sb);
unlock_super(sb); unlock_super(sb);
} }
u32 sysv_new_block(struct super_block * sb) u32 sysv_new_block(struct super_block * sb)
{ {
struct sysv_sb_info *sbi = SYSV_SB(sb);
unsigned int block; unsigned int block;
u32 nr; u32 nr;
struct buffer_head * bh; struct buffer_head * bh;
unsigned count; unsigned count;
lock_super(sb); lock_super(sb);
count = fs16_to_cpu(sb, *sb->sv_bcache_count); count = fs16_to_cpu(sbi, *sbi->s_bcache_count);
if (count == 0) /* Applies only to Coherent FS */ if (count == 0) /* Applies only to Coherent FS */
goto Enospc; goto Enospc;
nr = sb->sv_bcache[--count]; nr = sbi->s_bcache[--count];
if (nr == 0) /* Applies only to Xenix FS, SystemV FS */ if (nr == 0) /* Applies only to Xenix FS, SystemV FS */
goto Enospc; goto Enospc;
block = fs32_to_cpu(sb, nr); block = fs32_to_cpu(sbi, nr);
*sb->sv_bcache_count = cpu_to_fs16(sb, count); *sbi->s_bcache_count = cpu_to_fs16(sbi, count);
if (block < sb->sv_firstdatazone || block >= sb->sv_nzones) { if (block < sbi->s_firstdatazone || block >= sbi->s_nzones) {
printk("sysv_new_block: new block %d is not in data zone\n", printk("sysv_new_block: new block %d is not in data zone\n",
block); block);
goto Enospc; goto Enospc;
...@@ -124,26 +126,26 @@ u32 sysv_new_block(struct super_block * sb) ...@@ -124,26 +126,26 @@ u32 sysv_new_block(struct super_block * sb)
if (count == 0) { /* the last block continues the free list */ if (count == 0) { /* the last block continues the free list */
unsigned count; unsigned count;
block += sb->sv_block_base; block += sbi->s_block_base;
if (!(bh = sb_bread(sb, block))) { if (!(bh = sb_bread(sb, block))) {
printk("sysv_new_block: cannot read free-list block\n"); printk("sysv_new_block: cannot read free-list block\n");
/* retry this same block next time */ /* retry this same block next time */
*sb->sv_bcache_count = cpu_to_fs16(sb, 1); *sbi->s_bcache_count = cpu_to_fs16(sbi, 1);
goto Enospc; goto Enospc;
} }
count = fs16_to_cpu(sb, *(u16*)bh->b_data); count = fs16_to_cpu(sbi, *(u16*)bh->b_data);
if (count > sb->sv_flc_size) { if (count > sbi->s_flc_size) {
printk("sysv_new_block: free-list block with >flc_size entries\n"); printk("sysv_new_block: free-list block with >flc_size entries\n");
brelse(bh); brelse(bh);
goto Enospc; goto Enospc;
} }
*sb->sv_bcache_count = cpu_to_fs16(sb, count); *sbi->s_bcache_count = cpu_to_fs16(sbi, count);
memcpy(sb->sv_bcache, get_chunk(sb, bh), memcpy(sbi->s_bcache, get_chunk(sb, bh),
count * sizeof(sysv_zone_t)); count * sizeof(sysv_zone_t));
brelse(bh); brelse(bh);
} }
/* Now the free list head in the superblock is valid again. */ /* Now the free list head in the superblock is valid again. */
fs32_add(sb, sb->sv_free_blocks, -1); fs32_add(sbi, sbi->s_free_blocks, -1);
dirty_sb(sb); dirty_sb(sb);
unlock_super(sb); unlock_super(sb);
return nr; return nr;
...@@ -155,6 +157,7 @@ u32 sysv_new_block(struct super_block * sb) ...@@ -155,6 +157,7 @@ u32 sysv_new_block(struct super_block * sb)
unsigned long sysv_count_free_blocks(struct super_block * sb) unsigned long sysv_count_free_blocks(struct super_block * sb)
{ {
struct sysv_sb_info * sbi = SYSV_SB(sb);
int sb_count; int sb_count;
int count; int count;
struct buffer_head * bh = NULL; struct buffer_head * bh = NULL;
...@@ -167,21 +170,21 @@ unsigned long sysv_count_free_blocks(struct super_block * sb) ...@@ -167,21 +170,21 @@ unsigned long sysv_count_free_blocks(struct super_block * sb)
* free list). As AFS is supposed to be read-only we just * free list). As AFS is supposed to be read-only we just
* lie and say it has no free block at all. * lie and say it has no free block at all.
*/ */
if (sb->sv_type == FSTYPE_AFS) if (sbi->s_type == FSTYPE_AFS)
return 0; return 0;
lock_super(sb); lock_super(sb);
sb_count = fs32_to_cpu(sb, *sb->sv_free_blocks); sb_count = fs32_to_cpu(sbi, *sbi->s_free_blocks);
if (0) if (0)
goto trust_sb; goto trust_sb;
/* this causes a lot of disk traffic ... */ /* this causes a lot of disk traffic ... */
count = 0; count = 0;
n = fs16_to_cpu(sb, *sb->sv_bcache_count); n = fs16_to_cpu(sbi, *sbi->s_bcache_count);
blocks = sb->sv_bcache; blocks = sbi->s_bcache;
while (1) { while (1) {
if (n > sb->sv_flc_size) if (n > sbi->s_flc_size)
goto E2big; goto E2big;
block = 0; block = 0;
while (n && (block = blocks[--n]) != 0) while (n && (block = blocks[--n]) != 0)
...@@ -189,17 +192,17 @@ unsigned long sysv_count_free_blocks(struct super_block * sb) ...@@ -189,17 +192,17 @@ unsigned long sysv_count_free_blocks(struct super_block * sb)
if (block == 0) if (block == 0)
break; break;
block = fs32_to_cpu(sb, block); block = fs32_to_cpu(sbi, block);
if (bh) if (bh)
brelse(bh); brelse(bh);
if (block < sb->sv_firstdatazone || block >= sb->sv_nzones) if (block < sbi->s_firstdatazone || block >= sbi->s_nzones)
goto Einval; goto Einval;
block += sb->sv_block_base; block += sbi->s_block_base;
bh = sb_bread(sb, block); bh = sb_bread(sb, block);
if (!bh) if (!bh)
goto Eio; goto Eio;
n = fs16_to_cpu(sb, *(u16*)bh->b_data); n = fs16_to_cpu(sbi, *(u16*)bh->b_data);
blocks = get_chunk(sb, bh); blocks = get_chunk(sb, bh);
} }
if (bh) if (bh)
...@@ -228,7 +231,7 @@ unsigned long sysv_count_free_blocks(struct super_block * sb) ...@@ -228,7 +231,7 @@ unsigned long sysv_count_free_blocks(struct super_block * sb)
printk("sysv_count_free_blocks: free block count was %d, " printk("sysv_count_free_blocks: free block count was %d, "
"correcting to %d\n", sb_count, count); "correcting to %d\n", sb_count, count);
if (!(sb->s_flags & MS_RDONLY)) { if (!(sb->s_flags & MS_RDONLY)) {
*sb->sv_free_blocks = cpu_to_fs32(sb, count); *sbi->s_free_blocks = cpu_to_fs32(sbi, count);
dirty_sb(sb); dirty_sb(sb);
} }
goto done; goto done;
......
fs/sysv/dir.c
View file @ d8f94035
...@@ -104,7 +104,8 @@ static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir) ...@@ -104,7 +104,8 @@ static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
over = filldir(dirent, name, strnlen(name,SYSV_NAMELEN), over = filldir(dirent, name, strnlen(name,SYSV_NAMELEN),
(n<<PAGE_CACHE_SHIFT) | offset, (n<<PAGE_CACHE_SHIFT) | offset,
fs16_to_cpu(sb, de->inode), DT_UNKNOWN); fs16_to_cpu(SYSV_SB(sb), de->inode),
DT_UNKNOWN);
if (over) { if (over) {
dir_put_page(page); dir_put_page(page);
goto done; goto done;
...@@ -228,7 +229,7 @@ int sysv_add_link(struct dentry *dentry, struct inode *inode) ...@@ -228,7 +229,7 @@ int sysv_add_link(struct dentry *dentry, struct inode *inode)
goto out_unlock; goto out_unlock;
memcpy (de->name, name, namelen); memcpy (de->name, name, namelen);
memset (de->name + namelen, 0, SYSV_DIRSIZE - namelen - 2); memset (de->name + namelen, 0, SYSV_DIRSIZE - namelen - 2);
de->inode = cpu_to_fs16(inode->i_sb, inode->i_ino); de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
err = dir_commit_chunk(page, from, to); err = dir_commit_chunk(page, from, to);
dir->i_mtime = dir->i_ctime = CURRENT_TIME; dir->i_mtime = dir->i_ctime = CURRENT_TIME;
mark_inode_dirty(dir); mark_inode_dirty(dir);
...@@ -280,10 +281,10 @@ int sysv_make_empty(struct inode *inode, struct inode *dir) ...@@ -280,10 +281,10 @@ int sysv_make_empty(struct inode *inode, struct inode *dir)
memset(base, 0, PAGE_CACHE_SIZE); memset(base, 0, PAGE_CACHE_SIZE);
de = (struct sysv_dir_entry *) base; de = (struct sysv_dir_entry *) base;
de->inode = cpu_to_fs16(inode->i_sb, inode->i_ino); de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
strcpy(de->name,"."); strcpy(de->name,".");
de++; de++;
de->inode = cpu_to_fs16(inode->i_sb, dir->i_ino); de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), dir->i_ino);
strcpy(de->name,".."); strcpy(de->name,"..");
err = dir_commit_chunk(page, 0, 2 * SYSV_DIRSIZE); err = dir_commit_chunk(page, 0, 2 * SYSV_DIRSIZE);
...@@ -321,7 +322,8 @@ int sysv_empty_dir(struct inode * inode) ...@@ -321,7 +322,8 @@ int sysv_empty_dir(struct inode * inode)
if (de->name[0] != '.') if (de->name[0] != '.')
goto not_empty; goto not_empty;
if (!de->name[1]) { if (!de->name[1]) {
if (de->inode == cpu_to_fs16(sb, inode->i_ino)) if (de->inode == cpu_to_fs16(SYSV_SB(sb),
inode->i_ino))
continue; continue;
goto not_empty; goto not_empty;
} }
...@@ -350,7 +352,7 @@ void sysv_set_link(struct sysv_dir_entry *de, struct page *page, ...@@ -350,7 +352,7 @@ void sysv_set_link(struct sysv_dir_entry *de, struct page *page,
err = page->mapping->a_ops->prepare_write(NULL, page, from, to); err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
if (err) if (err)
BUG(); BUG();
de->inode = cpu_to_fs16(inode->i_sb, inode->i_ino); de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino);
err = dir_commit_chunk(page, from, to); err = dir_commit_chunk(page, from, to);
UnlockPage(page); UnlockPage(page);
dir_put_page(page); dir_put_page(page);
...@@ -377,7 +379,7 @@ ino_t sysv_inode_by_name(struct dentry *dentry) ...@@ -377,7 +379,7 @@ ino_t sysv_inode_by_name(struct dentry *dentry)
ino_t res = 0; ino_t res = 0;
if (de) { if (de) {
res = fs16_to_cpu(dentry->d_sb, de->inode); res = fs16_to_cpu(SYSV_SB(dentry->d_sb), de->inode);
dir_put_page(page); dir_put_page(page);
} }
return res; return res;
......
fs/sysv/ialloc.c
View file @ d8f94035
...@@ -37,33 +37,38 @@ ...@@ -37,33 +37,38 @@
static inline sysv_ino_t * static inline sysv_ino_t *
sv_sb_fic_inode(struct super_block * sb, unsigned int i) sv_sb_fic_inode(struct super_block * sb, unsigned int i)
{ {
if (sb->sv_bh1 == sb->sv_bh2) struct sysv_sb_info *sbi = SYSV_SB(sb);
return &sb->sv_sb_fic_inodes[i];
if (sbi->s_bh1 == sbi->s_bh2)
return &sbi->s_sb_fic_inodes[i];
else { else {
/* 512 byte Xenix FS */ /* 512 byte Xenix FS */
unsigned int offset = offsetof(struct xenix_super_block, s_inode[i]); unsigned int offset = offsetof(struct xenix_super_block, s_inode[i]);
if (offset < 512) if (offset < 512)
return (sysv_ino_t*)(sb->sv_sbd1 + offset); return (sysv_ino_t*)(sbi->s_sbd1 + offset);
else else
return (sysv_ino_t*)(sb->sv_sbd2 + offset); return (sysv_ino_t*)(sbi->s_sbd2 + offset);
} }
} }
struct sysv_inode * struct sysv_inode *
sysv_raw_inode(struct super_block *sb, unsigned ino, struct buffer_head **bh) sysv_raw_inode(struct super_block *sb, unsigned ino, struct buffer_head **bh)
{ {
struct sysv_sb_info *sbi = SYSV_SB(sb);
struct sysv_inode *res; struct sysv_inode *res;
int block = sb->sv_firstinodezone + sb->sv_block_base; int block = sbi->s_firstinodezone + sbi->s_block_base;
block += (ino-1) >> sb->sv_inodes_per_block_bits;
block += (ino-1) >> sbi->s_inodes_per_block_bits;
*bh = sb_bread(sb, block); *bh = sb_bread(sb, block);
if (!*bh) if (!*bh)
return NULL; return NULL;
res = (struct sysv_inode *) (*bh)->b_data; res = (struct sysv_inode *)(*bh)->b_data;
return res + ((ino-1) & sb->sv_inodes_per_block_1); return res + ((ino-1) & sbi->s_inodes_per_block_1);
} }
static int refill_free_cache(struct super_block *sb) static int refill_free_cache(struct super_block *sb)
{ {
struct sysv_sb_info *sbi = SYSV_SB(sb);
struct buffer_head * bh; struct buffer_head * bh;
struct sysv_inode * raw_inode; struct sysv_inode * raw_inode;
int i = 0, ino; int i = 0, ino;
...@@ -72,13 +77,13 @@ static int refill_free_cache(struct super_block *sb) ...@@ -72,13 +77,13 @@ static int refill_free_cache(struct super_block *sb)
raw_inode = sysv_raw_inode(sb, ino, &bh); raw_inode = sysv_raw_inode(sb, ino, &bh);
if (!raw_inode) if (!raw_inode)
goto out; goto out;
while (ino <= sb->sv_ninodes) { while (ino <= sbi->s_ninodes) {
if (raw_inode->i_mode == 0 && raw_inode->i_nlink == 0) { if (raw_inode->i_mode == 0 && raw_inode->i_nlink == 0) {
*sv_sb_fic_inode(sb,i++) = cpu_to_fs16(sb, ino); *sv_sb_fic_inode(sb,i++) = cpu_to_fs16(SYSV_SB(sb), ino);
if (i == sb->sv_fic_size) if (i == sbi->s_fic_size)
break; break;
} }
if ((ino++ & sb->sv_inodes_per_block_1) == 0) { if ((ino++ & sbi->s_inodes_per_block_1) == 0) {
brelse(bh); brelse(bh);
raw_inode = sysv_raw_inode(sb, ino, &bh); raw_inode = sysv_raw_inode(sb, ino, &bh);
if (!raw_inode) if (!raw_inode)
...@@ -93,7 +98,8 @@ static int refill_free_cache(struct super_block *sb) ...@@ -93,7 +98,8 @@ static int refill_free_cache(struct super_block *sb)
void sysv_free_inode(struct inode * inode) void sysv_free_inode(struct inode * inode)
{ {
struct super_block * sb; struct super_block *sb = inode->i_sb;
struct sysv_sb_info *sbi = SYSV_SB(sb);
unsigned int ino; unsigned int ino;
struct buffer_head * bh; struct buffer_head * bh;
struct sysv_inode * raw_inode; struct sysv_inode * raw_inode;
...@@ -101,7 +107,7 @@ void sysv_free_inode(struct inode * inode) ...@@ -101,7 +107,7 @@ void sysv_free_inode(struct inode * inode)
sb = inode->i_sb; sb = inode->i_sb;
ino = inode->i_ino; ino = inode->i_ino;
if (ino <= SYSV_ROOT_INO || ino > sb->sv_ninodes) { if (ino <= SYSV_ROOT_INO || ino > sbi->s_ninodes) {
printk("sysv_free_inode: inode 0,1,2 or nonexistent inode\n"); printk("sysv_free_inode: inode 0,1,2 or nonexistent inode\n");
return; return;
} }
...@@ -113,12 +119,12 @@ void sysv_free_inode(struct inode * inode) ...@@ -113,12 +119,12 @@ void sysv_free_inode(struct inode * inode)
return; return;
} }
lock_super(sb); lock_super(sb);
count = fs16_to_cpu(sb, *sb->sv_sb_fic_count); count = fs16_to_cpu(sbi, *sbi->s_sb_fic_count);
if (count < sb->sv_fic_size) { if (count < sbi->s_fic_size) {
*sv_sb_fic_inode(sb,count++) = cpu_to_fs16(sb, ino); *sv_sb_fic_inode(sb,count++) = cpu_to_fs16(sbi, ino);
*sb->sv_sb_fic_count = cpu_to_fs16(sb, count); *sbi->s_sb_fic_count = cpu_to_fs16(sbi, count);
} }
fs16_add(sb, sb->sv_sb_total_free_inodes, 1); fs16_add(sbi, sbi->s_sb_total_free_inodes, 1);
dirty_sb(sb); dirty_sb(sb);
memset(raw_inode, 0, sizeof(struct sysv_inode)); memset(raw_inode, 0, sizeof(struct sysv_inode));
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
...@@ -128,18 +134,18 @@ void sysv_free_inode(struct inode * inode) ...@@ -128,18 +134,18 @@ void sysv_free_inode(struct inode * inode)
struct inode * sysv_new_inode(const struct inode * dir, mode_t mode) struct inode * sysv_new_inode(const struct inode * dir, mode_t mode)
{ {
struct inode * inode; struct super_block *sb = dir->i_sb;
struct super_block * sb; struct sysv_sb_info *sbi = SYSV_SB(sb);
struct inode *inode;
u16 ino; u16 ino;
unsigned count; unsigned count;
sb = dir->i_sb;
inode = new_inode(sb); inode = new_inode(sb);
if (!inode) if (!inode)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
lock_super(sb); lock_super(sb);
count = fs16_to_cpu(sb, *sb->sv_sb_fic_count); count = fs16_to_cpu(sbi, *sbi->s_sb_fic_count);
if (count == 0 || (*sv_sb_fic_inode(sb,count-1) == 0)) { if (count == 0 || (*sv_sb_fic_inode(sb,count-1) == 0)) {
count = refill_free_cache(sb); count = refill_free_cache(sb);
if (count == 0) { if (count == 0) {
...@@ -150,8 +156,8 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode) ...@@ -150,8 +156,8 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode)
} }
/* Now count > 0. */ /* Now count > 0. */
ino = *sv_sb_fic_inode(sb,--count); ino = *sv_sb_fic_inode(sb,--count);
*sb->sv_sb_fic_count = cpu_to_fs16(sb, count); *sbi->s_sb_fic_count = cpu_to_fs16(sbi, count);
fs16_add(sb, sb->sv_sb_total_free_inodes, -1); fs16_add(sbi, sbi->s_sb_total_free_inodes, -1);
dirty_sb(sb); dirty_sb(sb);
if (dir->i_mode & S_ISGID) { if (dir->i_mode & S_ISGID) {
...@@ -162,7 +168,7 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode) ...@@ -162,7 +168,7 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode)
inode->i_gid = current->fsgid; inode->i_gid = current->fsgid;
inode->i_uid = current->fsuid; inode->i_uid = current->fsuid;
inode->i_ino = fs16_to_cpu(sb, ino); inode->i_ino = fs16_to_cpu(sbi, ino);
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
inode->i_blocks = inode->i_blksize = 0; inode->i_blocks = inode->i_blksize = 0;
memset(SYSV_I(inode)->i_data, 0, sizeof(SYSV_I(inode)->i_data)); memset(SYSV_I(inode)->i_data, 0, sizeof(SYSV_I(inode)->i_data));
...@@ -180,13 +186,14 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode) ...@@ -180,13 +186,14 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode)
unsigned long sysv_count_free_inodes(struct super_block * sb) unsigned long sysv_count_free_inodes(struct super_block * sb)
{ {
struct sysv_sb_info *sbi = SYSV_SB(sb);
struct buffer_head * bh; struct buffer_head * bh;
struct sysv_inode * raw_inode; struct sysv_inode * raw_inode;
int ino, count, sb_count; int ino, count, sb_count;
lock_super(sb); lock_super(sb);
sb_count = fs16_to_cpu(sb, *sb->sv_sb_total_free_inodes); sb_count = fs16_to_cpu(sbi, *sbi->s_sb_total_free_inodes);
if (0) if (0)
goto trust_sb; goto trust_sb;
...@@ -197,10 +204,10 @@ unsigned long sysv_count_free_inodes(struct super_block * sb) ...@@ -197,10 +204,10 @@ unsigned long sysv_count_free_inodes(struct super_block * sb)
raw_inode = sysv_raw_inode(sb, ino, &bh); raw_inode = sysv_raw_inode(sb, ino, &bh);
if (!raw_inode) if (!raw_inode)
goto Eio; goto Eio;
while (ino <= sb->sv_ninodes) { while (ino <= sbi->s_ninodes) {
if (raw_inode->i_mode == 0 && raw_inode->i_nlink == 0) if (raw_inode->i_mode == 0 && raw_inode->i_nlink == 0)
count++; count++;
if ((ino++ & sb->sv_inodes_per_block_1) == 0) { if ((ino++ & sbi->s_inodes_per_block_1) == 0) {
brelse(bh); brelse(bh);
raw_inode = sysv_raw_inode(sb, ino, &bh); raw_inode = sysv_raw_inode(sb, ino, &bh);
if (!raw_inode) if (!raw_inode)
...@@ -220,7 +227,7 @@ unsigned long sysv_count_free_inodes(struct super_block * sb) ...@@ -220,7 +227,7 @@ unsigned long sysv_count_free_inodes(struct super_block * sb)
"free inode count was %d, correcting to %d\n", "free inode count was %d, correcting to %d\n",
sb_count, count); sb_count, count);
if (!(sb->s_flags & MS_RDONLY)) { if (!(sb->s_flags & MS_RDONLY)) {
*sb->sv_sb_total_free_inodes = cpu_to_fs16(sb, count); *sbi->s_sb_total_free_inodes = cpu_to_fs16(SYSV_SB(sb), count);
dirty_sb(sb); dirty_sb(sb);
} }
goto out; goto out;
......
fs/sysv/inode.c
View file @ d8f94035
...@@ -33,42 +33,53 @@ ...@@ -33,42 +33,53 @@
/* This is only called on sync() and umount(), when s_dirt=1. */ /* This is only called on sync() and umount(), when s_dirt=1. */
static void sysv_write_super(struct super_block *sb) static void sysv_write_super(struct super_block *sb)
{ {
if (!(sb->s_flags & MS_RDONLY)) { struct sysv_sb_info *sbi = SYSV_SB(sb);
/* If we are going to write out the super block, unsigned long time = CURRENT_TIME, old_time;
then attach current time stamp.
But if the filesystem was marked clean, keep it clean. */ if (sb->s_flags & MS_RDONLY)
unsigned long time = CURRENT_TIME; goto clean;
unsigned long old_time = fs32_to_cpu(sb, *sb->sv_sb_time);
if (sb->sv_type == FSTYPE_SYSV4) /*
if (*sb->sv_sb_state == cpu_to_fs32(sb, 0x7c269d38 - old_time)) * If we are going to write out the super block,
*sb->sv_sb_state = cpu_to_fs32(sb, 0x7c269d38 - time); * then attach current time stamp.
*sb->sv_sb_time = cpu_to_fs32(sb, time); * But if the filesystem was marked clean, keep it clean.
mark_buffer_dirty(sb->sv_bh2); */
old_time = fs32_to_cpu(sbi, *sbi->s_sb_time);
if (sbi->s_type == FSTYPE_SYSV4) {
if (*sbi->s_sb_state == cpu_to_fs32(sbi, 0x7c269d38 - old_time))
*sbi->s_sb_state = cpu_to_fs32(sbi, 0x7c269d38 - time);
*sbi->s_sb_time = cpu_to_fs32(sbi, time);
mark_buffer_dirty(sbi->s_bh2);
} }
clean:
sb->s_dirt = 0; sb->s_dirt = 0;
} }
static void sysv_put_super(struct super_block *sb) static void sysv_put_super(struct super_block *sb)
{ {
struct sysv_sb_info *sbi = SYSV_SB(sb);
if (!(sb->s_flags & MS_RDONLY)) { if (!(sb->s_flags & MS_RDONLY)) {
/* XXX ext2 also updates the state here */ /* XXX ext2 also updates the state here */
mark_buffer_dirty(sb->sv_bh1); mark_buffer_dirty(sbi->s_bh1);
if (sb->sv_bh1 != sb->sv_bh2) if (sbi->s_bh1 != sbi->s_bh2)
mark_buffer_dirty(sb->sv_bh2); mark_buffer_dirty(sbi->s_bh2);
} }
brelse(sb->sv_bh1); brelse(sbi->s_bh1);
if (sb->sv_bh1 != sb->sv_bh2) if (sbi->s_bh1 != sbi->s_bh2)
brelse(sb->sv_bh2); brelse(sbi->s_bh2);
} }
static int sysv_statfs(struct super_block *sb, struct statfs *buf) static int sysv_statfs(struct super_block *sb, struct statfs *buf)
{ {
struct sysv_sb_info *sbi = SYSV_SB(sb);
buf->f_type = sb->s_magic; buf->f_type = sb->s_magic;
buf->f_bsize = sb->s_blocksize; buf->f_bsize = sb->s_blocksize;
buf->f_blocks = sb->sv_ndatazones; buf->f_blocks = sbi->s_ndatazones;
buf->f_bavail = buf->f_bfree = sysv_count_free_blocks(sb); buf->f_bavail = buf->f_bfree = sysv_count_free_blocks(sb);
buf->f_files = sb->sv_ninodes; buf->f_files = sbi->s_ninodes;
buf->f_ffree = sysv_count_free_inodes(sb); buf->f_ffree = sysv_count_free_inodes(sb);
buf->f_namelen = SYSV_NAMELEN; buf->f_namelen = SYSV_NAMELEN;
return 0; return 0;
...@@ -77,15 +88,15 @@ static int sysv_statfs(struct super_block *sb, struct statfs *buf) ...@@ -77,15 +88,15 @@ static int sysv_statfs(struct super_block *sb, struct statfs *buf)
/* /*
* NXI <-> N0XI for PDP, XIN <-> XIN0 for le32, NIX <-> 0NIX for be32 * NXI <-> N0XI for PDP, XIN <-> XIN0 for le32, NIX <-> 0NIX for be32
*/ */
static inline void read3byte(struct super_block *sb, static inline void read3byte(struct sysv_sb_info *sbi,
unsigned char * from, unsigned char * to) unsigned char * from, unsigned char * to)
{ {
if (sb->sv_bytesex == BYTESEX_PDP) { if (sbi->s_bytesex == BYTESEX_PDP) {
to[0] = from[0]; to[0] = from[0];
to[1] = 0; to[1] = 0;
to[2] = from[1]; to[2] = from[1];
to[3] = from[2]; to[3] = from[2];
} else if (sb->sv_bytesex == BYTESEX_LE) { } else if (sbi->s_bytesex == BYTESEX_LE) {
to[0] = from[0]; to[0] = from[0];
to[1] = from[1]; to[1] = from[1];
to[2] = from[2]; to[2] = from[2];
...@@ -98,14 +109,14 @@ static inline void read3byte(struct super_block *sb, ...@@ -98,14 +109,14 @@ static inline void read3byte(struct super_block *sb,
} }
} }
static inline void write3byte(struct super_block *sb, static inline void write3byte(struct sysv_sb_info *sbi,
unsigned char * from, unsigned char * to) unsigned char * from, unsigned char * to)
{ {
if (sb->sv_bytesex == BYTESEX_PDP) { if (sbi->s_bytesex == BYTESEX_PDP) {
to[0] = from[0]; to[0] = from[0];
to[1] = from[2]; to[1] = from[2];
to[2] = from[3]; to[2] = from[3];
} else if (sb->sv_bytesex == BYTESEX_LE) { } else if (sbi->s_bytesex == BYTESEX_LE) {
to[0] = from[0]; to[0] = from[0];
to[1] = from[1]; to[1] = from[1];
to[2] = from[2]; to[2] = from[2];
...@@ -144,6 +155,7 @@ void sysv_set_inode(struct inode *inode, dev_t rdev) ...@@ -144,6 +155,7 @@ void sysv_set_inode(struct inode *inode, dev_t rdev)
static void sysv_read_inode(struct inode *inode) static void sysv_read_inode(struct inode *inode)
{ {
struct super_block * sb = inode->i_sb; struct super_block * sb = inode->i_sb;
struct sysv_sb_info * sbi = SYSV_SB(sb);
struct buffer_head * bh; struct buffer_head * bh;
struct sysv_inode * raw_inode; struct sysv_inode * raw_inode;
struct sysv_inode_info * si; struct sysv_inode_info * si;
...@@ -151,7 +163,7 @@ static void sysv_read_inode(struct inode *inode) ...@@ -151,7 +163,7 @@ static void sysv_read_inode(struct inode *inode)
dev_t rdev = 0; dev_t rdev = 0;
ino = inode->i_ino; ino = inode->i_ino;
if (!ino || ino > sb->sv_ninodes) { if (!ino || ino > sbi->s_ninodes) {
printk("Bad inode number on dev %s: %d is out of range\n", printk("Bad inode number on dev %s: %d is out of range\n",
inode->i_sb->s_id, ino); inode->i_sb->s_id, ino);
goto bad_inode; goto bad_inode;
...@@ -163,23 +175,23 @@ static void sysv_read_inode(struct inode *inode) ...@@ -163,23 +175,23 @@ static void sysv_read_inode(struct inode *inode)
goto bad_inode; goto bad_inode;
} }
/* SystemV FS: kludge permissions if ino==SYSV_ROOT_INO ?? */ /* SystemV FS: kludge permissions if ino==SYSV_ROOT_INO ?? */
inode->i_mode = fs16_to_cpu(sb, raw_inode->i_mode); inode->i_mode = fs16_to_cpu(sbi, raw_inode->i_mode);
inode->i_uid = (uid_t)fs16_to_cpu(sb, raw_inode->i_uid); inode->i_uid = (uid_t)fs16_to_cpu(sbi, raw_inode->i_uid);
inode->i_gid = (gid_t)fs16_to_cpu(sb, raw_inode->i_gid); inode->i_gid = (gid_t)fs16_to_cpu(sbi, raw_inode->i_gid);
inode->i_nlink = fs16_to_cpu(sb, raw_inode->i_nlink); inode->i_nlink = fs16_to_cpu(sbi, raw_inode->i_nlink);
inode->i_size = fs32_to_cpu(sb, raw_inode->i_size); inode->i_size = fs32_to_cpu(sbi, raw_inode->i_size);
inode->i_atime = fs32_to_cpu(sb, raw_inode->i_atime); inode->i_atime = fs32_to_cpu(sbi, raw_inode->i_atime);
inode->i_mtime = fs32_to_cpu(sb, raw_inode->i_mtime); inode->i_mtime = fs32_to_cpu(sbi, raw_inode->i_mtime);
inode->i_ctime = fs32_to_cpu(sb, raw_inode->i_ctime); inode->i_ctime = fs32_to_cpu(sbi, raw_inode->i_ctime);
inode->i_blocks = inode->i_blksize = 0; inode->i_blocks = inode->i_blksize = 0;
si = SYSV_I(inode); si = SYSV_I(inode);
for (block = 0; block < 10+1+1+1; block++) for (block = 0; block < 10+1+1+1; block++)
read3byte(sb, &raw_inode->i_a.i_addb[3*block], read3byte(sbi, &raw_inode->i_a.i_addb[3*block],
(unsigned char*)&si->i_data[block]); (unsigned char*)&si->i_data[block]);
brelse(bh); brelse(bh);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
rdev = (u16)fs32_to_cpu(sb, si->i_data[0]); rdev = (u16)fs32_to_cpu(sbi, si->i_data[0]);
si->i_dir_start_lookup = 0; si->i_dir_start_lookup = 0;
sysv_set_inode(inode, rdev); sysv_set_inode(inode, rdev);
return; return;
...@@ -192,13 +204,14 @@ static void sysv_read_inode(struct inode *inode) ...@@ -192,13 +204,14 @@ static void sysv_read_inode(struct inode *inode)
static struct buffer_head * sysv_update_inode(struct inode * inode) static struct buffer_head * sysv_update_inode(struct inode * inode)
{ {
struct super_block * sb = inode->i_sb; struct super_block * sb = inode->i_sb;
struct sysv_sb_info * sbi = SYSV_SB(sb);
struct buffer_head * bh; struct buffer_head * bh;
struct sysv_inode * raw_inode; struct sysv_inode * raw_inode;
struct sysv_inode_info * si; struct sysv_inode_info * si;
unsigned int ino, block; unsigned int ino, block;
ino = inode->i_ino; ino = inode->i_ino;
if (!ino || ino > sb->sv_ninodes) { if (!ino || ino > sbi->s_ninodes) {
printk("Bad inode number on dev %s: %d is out of range\n", printk("Bad inode number on dev %s: %d is out of range\n",
inode->i_sb->s_id, ino); inode->i_sb->s_id, ino);
return 0; return 0;
...@@ -209,20 +222,20 @@ static struct buffer_head * sysv_update_inode(struct inode * inode) ...@@ -209,20 +222,20 @@ static struct buffer_head * sysv_update_inode(struct inode * inode)
return 0; return 0;
} }
raw_inode->i_mode = cpu_to_fs16(sb, inode->i_mode); raw_inode->i_mode = cpu_to_fs16(sbi, inode->i_mode);
raw_inode->i_uid = cpu_to_fs16(sb, fs_high2lowuid(inode->i_uid)); raw_inode->i_uid = cpu_to_fs16(sbi, fs_high2lowuid(inode->i_uid));
raw_inode->i_gid = cpu_to_fs16(sb, fs_high2lowgid(inode->i_gid)); raw_inode->i_gid = cpu_to_fs16(sbi, fs_high2lowgid(inode->i_gid));
raw_inode->i_nlink = cpu_to_fs16(sb, inode->i_nlink); raw_inode->i_nlink = cpu_to_fs16(sbi, inode->i_nlink);
raw_inode->i_size = cpu_to_fs32(sb, inode->i_size); raw_inode->i_size = cpu_to_fs32(sbi, inode->i_size);
raw_inode->i_atime = cpu_to_fs32(sb, inode->i_atime); raw_inode->i_atime = cpu_to_fs32(sbi, inode->i_atime);
raw_inode->i_mtime = cpu_to_fs32(sb, inode->i_mtime); raw_inode->i_mtime = cpu_to_fs32(sbi, inode->i_mtime);
raw_inode->i_ctime = cpu_to_fs32(sb, inode->i_ctime); raw_inode->i_ctime = cpu_to_fs32(sbi, inode->i_ctime);
si = SYSV_I(inode); si = SYSV_I(inode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
si->i_data[0] = cpu_to_fs32(sb, kdev_t_to_nr(inode->i_rdev)); si->i_data[0] = cpu_to_fs32(sbi, kdev_t_to_nr(inode->i_rdev));
for (block = 0; block < 10+1+1+1; block++) for (block = 0; block < 10+1+1+1; block++)
write3byte(sb, (unsigned char*)&si->i_data[block], write3byte(sbi, (unsigned char*)&si->i_data[block],
&raw_inode->i_a.i_addb[3*block]); &raw_inode->i_a.i_addb[3*block]);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
return bh; return bh;
......
fs/sysv/itree.c
View file @ d8f94035
...@@ -24,9 +24,10 @@ static inline void dirty_indirect(struct buffer_head *bh, struct inode *inode) ...@@ -24,9 +24,10 @@ static inline void dirty_indirect(struct buffer_head *bh, struct inode *inode)
static int block_to_path(struct inode *inode, long block, int offsets[DEPTH]) static int block_to_path(struct inode *inode, long block, int offsets[DEPTH])
{ {
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
int ptrs_bits = sb->sv_ind_per_block_bits; struct sysv_sb_info *sbi = SYSV_SB(sb);
unsigned long indirect_blocks = sb->sv_ind_per_block, int ptrs_bits = sbi->s_ind_per_block_bits;
double_blocks = sb->sv_ind_per_block_2; unsigned long indirect_blocks = sbi->s_ind_per_block,
double_blocks = sbi->s_ind_per_block_2;
int n = 0; int n = 0;
if (block < 0) { if (block < 0) {
...@@ -51,9 +52,9 @@ static int block_to_path(struct inode *inode, long block, int offsets[DEPTH]) ...@@ -51,9 +52,9 @@ static int block_to_path(struct inode *inode, long block, int offsets[DEPTH])
return n; return n;
} }
static inline int block_to_cpu(struct super_block *sb, u32 nr) static inline int block_to_cpu(struct sysv_sb_info *sbi, u32 nr)
{ {
return sb->sv_block_base + fs32_to_cpu(sb, nr); return sbi->s_block_base + fs32_to_cpu(sbi, nr);
} }
typedef struct { typedef struct {
...@@ -95,7 +96,7 @@ static Indirect *get_branch(struct inode *inode, ...@@ -95,7 +96,7 @@ static Indirect *get_branch(struct inode *inode,
if (!p->key) if (!p->key)
goto no_block; goto no_block;
while (--depth) { while (--depth) {
int block = block_to_cpu(sb, p->key); int block = block_to_cpu(SYSV_SB(sb), p->key);
bh = sb_bread(sb, block); bh = sb_bread(sb, block);
if (!bh) if (!bh)
goto failure; goto failure;
...@@ -137,7 +138,7 @@ static int alloc_branch(struct inode *inode, ...@@ -137,7 +138,7 @@ static int alloc_branch(struct inode *inode,
* Get buffer_head for parent block, zero it out and set * Get buffer_head for parent block, zero it out and set
* the pointer to new one, then send parent to disk. * the pointer to new one, then send parent to disk.
*/ */
parent = block_to_cpu(inode->i_sb, branch[n-1].key); parent = block_to_cpu(SYSV_SB(inode->i_sb), branch[n-1].key);
bh = sb_getblk(inode->i_sb, parent); bh = sb_getblk(inode->i_sb, parent);
lock_buffer(bh); lock_buffer(bh);
memset(bh->b_data, 0, blocksize); memset(bh->b_data, 0, blocksize);
...@@ -211,7 +212,8 @@ static int get_block(struct inode *inode, sector_t iblock, struct buffer_head *b ...@@ -211,7 +212,8 @@ static int get_block(struct inode *inode, sector_t iblock, struct buffer_head *b
/* Simplest case - block found, no allocation needed */ /* Simplest case - block found, no allocation needed */
if (!partial) { if (!partial) {
got_it: got_it:
map_bh(bh_result, sb, block_to_cpu(sb, chain[depth-1].key)); map_bh(bh_result, sb, block_to_cpu(SYSV_SB(sb),
chain[depth-1].key));
/* Clean up and exit */ /* Clean up and exit */
partial = chain+depth-1; /* the whole chain */ partial = chain+depth-1; /* the whole chain */
goto cleanup; goto cleanup;
...@@ -332,7 +334,7 @@ static void free_branches(struct inode *inode, u32 *p, u32 *q, int depth) ...@@ -332,7 +334,7 @@ static void free_branches(struct inode *inode, u32 *p, u32 *q, int depth)
if (!nr) if (!nr)
continue; continue;
*p = 0; *p = 0;
block = block_to_cpu(sb, nr); block = block_to_cpu(SYSV_SB(sb), nr);
bh = sb_bread(sb, block); bh = sb_bread(sb, block);
if (!bh) if (!bh)
continue; continue;
......
fs/sysv/namei.c
View file @ d8f94035
...@@ -138,7 +138,7 @@ static int sysv_link(struct dentry * old_dentry, struct inode * dir, ...@@ -138,7 +138,7 @@ static int sysv_link(struct dentry * old_dentry, struct inode * dir,
{ {
struct inode *inode = old_dentry->d_inode; struct inode *inode = old_dentry->d_inode;
if (inode->i_nlink >= inode->i_sb->sv_link_max) if (inode->i_nlink >= SYSV_SB(inode->i_sb)->s_link_max)
return -EMLINK; return -EMLINK;
inode->i_ctime = CURRENT_TIME; inode->i_ctime = CURRENT_TIME;
...@@ -153,7 +153,7 @@ static int sysv_mkdir(struct inode * dir, struct dentry *dentry, int mode) ...@@ -153,7 +153,7 @@ static int sysv_mkdir(struct inode * dir, struct dentry *dentry, int mode)
struct inode * inode; struct inode * inode;
int err = -EMLINK; int err = -EMLINK;
if (dir->i_nlink >= dir->i_sb->sv_link_max) if (dir->i_nlink >= SYSV_SB(dir->i_sb)->s_link_max)
goto out; goto out;
inc_count(dir); inc_count(dir);
...@@ -271,7 +271,7 @@ static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry, ...@@ -271,7 +271,7 @@ static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry,
} else { } else {
if (dir_de) { if (dir_de) {
err = -EMLINK; err = -EMLINK;
if (new_dir->i_nlink >= new_dir->i_sb->sv_link_max) if (new_dir->i_nlink >= SYSV_SB(new_dir->i_sb)->s_link_max)
goto out_dir; goto out_dir;
} }
inc_count(old_inode); inc_count(old_inode);
......
fs/sysv/super.c
View file @ d8f94035
This diff is collapsed.
include/linux/sysv_fs.h
View file @ d8f94035
...@@ -19,16 +19,20 @@ ...@@ -19,16 +19,20 @@
#include <linux/stat.h> /* declares S_IFLNK etc. */ #include <linux/stat.h> /* declares S_IFLNK etc. */
#include <linux/sched.h> /* declares wake_up() */ #include <linux/sched.h> /* declares wake_up() */
#include <linux/sysv_fs_sb.h> /* defines the sv_... shortcuts */
/* temporary hack. */ #include <linux/sysv_fs_sb.h>
#include <linux/sysv_fs_i.h> #include <linux/sysv_fs_i.h>
static inline struct sysv_inode_info *SYSV_I(struct inode *inode) static inline struct sysv_inode_info *SYSV_I(struct inode *inode)
{ {
/* I think list_entry should have a more descriptive name.. --hch */
return list_entry(inode, struct sysv_inode_info, vfs_inode); return list_entry(inode, struct sysv_inode_info, vfs_inode);
} }
/* end temporary hack. */
static inline struct sysv_sb_info *SYSV_SB(struct super_block *sb)
{
return &sb->u.sysv_sb;
}
/* Layout on disk */ /* Layout on disk */
...@@ -346,61 +350,63 @@ extern struct sysv_inode *sysv_raw_inode(struct super_block *, unsigned, struct ...@@ -346,61 +350,63 @@ extern struct sysv_inode *sysv_raw_inode(struct super_block *, unsigned, struct
static inline void dirty_sb(struct super_block *sb) static inline void dirty_sb(struct super_block *sb)
{ {
mark_buffer_dirty(sb->sv_bh1); struct sysv_sb_info *sbi = SYSV_SB(sb);
if (sb->sv_bh1 != sb->sv_bh2)
mark_buffer_dirty(sb->sv_bh2); mark_buffer_dirty(sbi->s_bh1);
if (sbi->s_bh1 != sbi->s_bh2)
mark_buffer_dirty(sbi->s_bh2);
sb->s_dirt = 1; sb->s_dirt = 1;
} }
static inline u32 fs32_to_cpu(struct super_block *sb, u32 n) static inline u32 fs32_to_cpu(struct sysv_sb_info *sbi, u32 n)
{ {
if (sb->sv_bytesex == BYTESEX_PDP) if (sbi->s_bytesex == BYTESEX_PDP)
return PDP_swab(n); return PDP_swab(n);
else if (sb->sv_bytesex == BYTESEX_LE) else if (sbi->s_bytesex == BYTESEX_LE)
return le32_to_cpu(n); return le32_to_cpu(n);
else else
return be32_to_cpu(n); return be32_to_cpu(n);
} }
static inline u32 cpu_to_fs32(struct super_block *sb, u32 n) static inline u32 cpu_to_fs32(struct sysv_sb_info *sbi, u32 n)
{ {
if (sb->sv_bytesex == BYTESEX_PDP) if (sbi->s_bytesex == BYTESEX_PDP)
return PDP_swab(n); return PDP_swab(n);
else if (sb->sv_bytesex == BYTESEX_LE) else if (sbi->s_bytesex == BYTESEX_LE)
return cpu_to_le32(n); return cpu_to_le32(n);
else else
return cpu_to_be32(n); return cpu_to_be32(n);
} }
static inline u32 fs32_add(struct super_block *sb, u32 *n, int d) static inline u32 fs32_add(struct sysv_sb_info *sbi, u32 *n, int d)
{ {
if (sb->sv_bytesex == BYTESEX_PDP) if (sbi->s_bytesex == BYTESEX_PDP)
return *n = PDP_swab(PDP_swab(*n)+d); return *n = PDP_swab(PDP_swab(*n)+d);
else if (sb->sv_bytesex == BYTESEX_LE) else if (sbi->s_bytesex == BYTESEX_LE)
return *n = cpu_to_le32(le32_to_cpu(*n)+d); return *n = cpu_to_le32(le32_to_cpu(*n)+d);
else else
return *n = cpu_to_be32(be32_to_cpu(*n)+d); return *n = cpu_to_be32(be32_to_cpu(*n)+d);
} }
static inline u16 fs16_to_cpu(struct super_block *sb, u16 n) static inline u16 fs16_to_cpu(struct sysv_sb_info *sbi, u16 n)
{ {
if (sb->sv_bytesex != BYTESEX_BE) if (sbi->s_bytesex != BYTESEX_BE)
return le16_to_cpu(n); return le16_to_cpu(n);
else else
return be16_to_cpu(n); return be16_to_cpu(n);
} }
static inline u16 cpu_to_fs16(struct super_block *sb, u16 n) static inline u16 cpu_to_fs16(struct sysv_sb_info *sbi, u16 n)
{ {
if (sb->sv_bytesex != BYTESEX_BE) if (sbi->s_bytesex != BYTESEX_BE)
return cpu_to_le16(n); return cpu_to_le16(n);
else else
return cpu_to_be16(n); return cpu_to_be16(n);
} }
static inline u16 fs16_add(struct super_block *sb, u16 *n, int d) static inline u16 fs16_add(struct sysv_sb_info *sbi, u16 *n, int d)
{ {
if (sb->sv_bytesex != BYTESEX_BE) if (sbi->s_bytesex != BYTESEX_BE)
return *n = cpu_to_le16(le16_to_cpu(*n)+d); return *n = cpu_to_le16(le16_to_cpu(*n)+d);
else else
return *n = cpu_to_be16(be16_to_cpu(*n)+d); return *n = cpu_to_be16(be16_to_cpu(*n)+d);
......
include/linux/sysv_fs_sb.h
View file @ d8f94035
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
*/ */
struct sysv_sb_info { struct sysv_sb_info {
struct super_block *s_sb; /* VFS superblock */
int s_type; /* file system type: FSTYPE_{XENIX|SYSV|COH} */ int s_type; /* file system type: FSTYPE_{XENIX|SYSV|COH} */
char s_bytesex; /* bytesex (le/be/pdp) */ char s_bytesex; /* bytesex (le/be/pdp) */
char s_truncate; /* if 1: names > SYSV_NAMELEN chars are truncated */ char s_truncate; /* if 1: names > SYSV_NAMELEN chars are truncated */
...@@ -52,38 +53,4 @@ struct sysv_sb_info { ...@@ -52,38 +53,4 @@ struct sysv_sb_info {
}; };
/* The field s_toobig_block is currently unused. */ /* The field s_toobig_block is currently unused. */
/* sv_ == u.sysv_sb.s_ */
#define sv_type u.sysv_sb.s_type
#define sv_bytesex u.sysv_sb.s_bytesex
#define sv_truncate u.sysv_sb.s_truncate
#define sv_link_max u.sysv_sb.s_link_max
#define sv_inodes_per_block u.sysv_sb.s_inodes_per_block
#define sv_inodes_per_block_1 u.sysv_sb.s_inodes_per_block_1
#define sv_inodes_per_block_bits u.sysv_sb.s_inodes_per_block_bits
#define sv_ind_per_block u.sysv_sb.s_ind_per_block
#define sv_ind_per_block_bits u.sysv_sb.s_ind_per_block_bits
#define sv_ind_per_block_2 u.sysv_sb.s_ind_per_block_2
#define sv_toobig_block u.sysv_sb.s_toobig_block
#define sv_block_base u.sysv_sb.s_block_base
#define sv_fic_size u.sysv_sb.s_fic_size
#define sv_flc_size u.sysv_sb.s_flc_size
#define sv_bh1 u.sysv_sb.s_bh1
#define sv_bh2 u.sysv_sb.s_bh2
#define sv_sbd1 u.sysv_sb.s_sbd1
#define sv_sbd2 u.sysv_sb.s_sbd2
#define sv_sb_fic_count u.sysv_sb.s_sb_fic_count
#define sv_sb_fic_inodes u.sysv_sb.s_sb_fic_inodes
#define sv_sb_total_free_inodes u.sysv_sb.s_sb_total_free_inodes
#define sv_bcache_count u.sysv_sb.s_bcache_count
#define sv_bcache u.sysv_sb.s_bcache
#define sv_free_blocks u.sysv_sb.s_free_blocks
#define sv_sb_time u.sysv_sb.s_sb_time
#define sv_sb_state u.sysv_sb.s_sb_state
#define sv_firstinodezone u.sysv_sb.s_firstinodezone
#define sv_firstdatazone u.sysv_sb.s_firstdatazone
#define sv_ninodes u.sysv_sb.s_ninodes
#define sv_ndatazones u.sysv_sb.s_ndatazones
#define sv_nzones u.sysv_sb.s_nzones
#define sv_namelen u.sysv_sb.s_namelen
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7