luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sanitize ->fsync() for FAT

Browse Source 
* mark directory data blocks as assoc. metadata
* add new inode to deal with FAT, mark FAT blocks as assoc. metadata of that
* now ->fsync() is trivial both for files and directories

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2009-06-07 13:44:36 -04:00
parent 964f536966
commit b522412aea
7 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/fat/dir.c
View File

@ -840,7 +840,7 @@ const struct file_operations fat_dir_operations = {
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compat_ioctl = fat_compat_dir_ioctl, .compat_ioctl = fat_compat_dir_ioctl,
#endif #endif
.fsync = file_fsync, .fsync = fat_file_fsync,
}; };
static int fat_get_short_entry(struct inode *dir, loff_t *pos, static int fat_get_short_entry(struct inode *dir, loff_t *pos,
@ -967,7 +967,7 @@ static int __fat_remove_entries(struct inode *dir, loff_t pos, int nr_slots)
de++; de++;
nr_slots--; nr_slots--;
} }
mark_buffer_dirty(bh); mark_buffer_dirty_inode(bh, dir);
if (IS_DIRSYNC(dir)) if (IS_DIRSYNC(dir))
err = sync_dirty_buffer(bh); err = sync_dirty_buffer(bh);
brelse(bh); brelse(bh);
@ -1001,7 +1001,7 @@ int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo)
de--; de--;
nr_slots--; nr_slots--;
} }
mark_buffer_dirty(bh); mark_buffer_dirty_inode(bh, dir);
if (IS_DIRSYNC(dir)) if (IS_DIRSYNC(dir))
err = sync_dirty_buffer(bh); err = sync_dirty_buffer(bh);
brelse(bh); brelse(bh);
@ -1051,7 +1051,7 @@ static int fat_zeroed_cluster(struct inode *dir, sector_t blknr, int nr_used,
} }
memset(bhs[n]->b_data, 0, sb->s_blocksize); memset(bhs[n]->b_data, 0, sb->s_blocksize);
set_buffer_uptodate(bhs[n]); set_buffer_uptodate(bhs[n]);
mark_buffer_dirty(bhs[n]); mark_buffer_dirty_inode(bhs[n], dir);
n++; n++;
blknr++; blknr++;
@ -1131,7 +1131,7 @@ int fat_alloc_new_dir(struct inode *dir, struct timespec *ts)
de[0].size = de[1].size = 0; de[0].size = de[1].size = 0;
memset(de + 2, 0, sb->s_blocksize - 2 * sizeof(*de)); memset(de + 2, 0, sb->s_blocksize - 2 * sizeof(*de));
set_buffer_uptodate(bhs[0]); set_buffer_uptodate(bhs[0]);
mark_buffer_dirty(bhs[0]); mark_buffer_dirty_inode(bhs[0], dir);
err = fat_zeroed_cluster(dir, blknr, 1, bhs, MAX_BUF_PER_PAGE); err = fat_zeroed_cluster(dir, blknr, 1, bhs, MAX_BUF_PER_PAGE);
if (err) if (err)
@ -1193,7 +1193,7 @@ static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots,
slots += copy; slots += copy;
size -= copy; size -= copy;
set_buffer_uptodate(bhs[n]); set_buffer_uptodate(bhs[n]);
mark_buffer_dirty(bhs[n]); mark_buffer_dirty_inode(bhs[n], dir);
if (!size) if (!size)
break; break;
n++; n++;
@ -1293,7 +1293,7 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots,
for (i = 0; i < long_bhs; i++) { for (i = 0; i < long_bhs; i++) {
int copy = min_t(int, sb->s_blocksize - offset, size); int copy = min_t(int, sb->s_blocksize - offset, size);
memcpy(bhs[i]->b_data + offset, slots, copy); memcpy(bhs[i]->b_data + offset, slots, copy);
mark_buffer_dirty(bhs[i]); mark_buffer_dirty_inode(bhs[i], dir);
offset = 0; offset = 0;
slots += copy; slots += copy;
size -= copy; size -= copy;
@ -1304,7 +1304,7 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots,
/* Fill the short name slot. */ /* Fill the short name slot. */
int copy = min_t(int, sb->s_blocksize - offset, size); int copy = min_t(int, sb->s_blocksize - offset, size);
memcpy(bhs[i]->b_data + offset, slots, copy); memcpy(bhs[i]->b_data + offset, slots, copy);
mark_buffer_dirty(bhs[i]); mark_buffer_dirty_inode(bhs[i], dir);
if (IS_DIRSYNC(dir)) if (IS_DIRSYNC(dir))
err = sync_dirty_buffer(bhs[i]); err = sync_dirty_buffer(bhs[i]);
} }

6
fs/fat/fat.h
View File

@ -74,6 +74,7 @@ struct msdos_sb_info {
int fatent_shift; int fatent_shift;
struct fatent_operations *fatent_ops; struct fatent_operations *fatent_ops;
struct inode *fat_inode;
spinlock_t inode_hash_lock; spinlock_t inode_hash_lock;
struct hlist_head inode_hashtable[FAT_HASH_SIZE]; struct hlist_head inode_hashtable[FAT_HASH_SIZE];
@ -251,6 +252,7 @@ struct fat_entry {
} u; } u;
int nr_bhs; int nr_bhs;
struct buffer_head *bhs[2]; struct buffer_head *bhs[2];
struct inode *fat_inode;
}; };
static inline void fatent_init(struct fat_entry *fatent) static inline void fatent_init(struct fat_entry *fatent)
@ -259,6 +261,7 @@ static inline void fatent_init(struct fat_entry *fatent)
fatent->entry = 0; fatent->entry = 0;
fatent->u.ent32_p = NULL; fatent->u.ent32_p = NULL;
fatent->bhs[0] = fatent->bhs[1] = NULL; fatent->bhs[0] = fatent->bhs[1] = NULL;
fatent->fat_inode = NULL;
} }
static inline void fatent_set_entry(struct fat_entry *fatent, int entry) static inline void fatent_set_entry(struct fat_entry *fatent, int entry)
@ -275,6 +278,7 @@ static inline void fatent_brelse(struct fat_entry *fatent)
brelse(fatent->bhs[i]); brelse(fatent->bhs[i]);
fatent->nr_bhs = 0; fatent->nr_bhs = 0;
fatent->bhs[0] = fatent->bhs[1] = NULL; fatent->bhs[0] = fatent->bhs[1] = NULL;
fatent->fat_inode = NULL;
} }
extern void fat_ent_access_init(struct super_block *sb); extern void fat_ent_access_init(struct super_block *sb);
@ -296,6 +300,8 @@ extern int fat_setattr(struct dentry * dentry, struct iattr * attr);
extern void fat_truncate(struct inode *inode); extern void fat_truncate(struct inode *inode);
extern int fat_getattr(struct vfsmount *mnt, struct dentry *dentry, extern int fat_getattr(struct vfsmount *mnt, struct dentry *dentry,
struct kstat *stat); struct kstat *stat);
extern int fat_file_fsync(struct file *file, struct dentry *dentry,
int datasync);
/* fat/inode.c */ /* fat/inode.c */
extern void fat_attach(struct inode *inode, loff_t i_pos); extern void fat_attach(struct inode *inode, loff_t i_pos);

13
fs/fat/fatent.c
View File

@ -73,6 +73,8 @@ static int fat12_ent_bread(struct super_block *sb, struct fat_entry *fatent,
struct buffer_head **bhs = fatent->bhs; struct buffer_head **bhs = fatent->bhs;
WARN_ON(blocknr < MSDOS_SB(sb)->fat_start); WARN_ON(blocknr < MSDOS_SB(sb)->fat_start);
fatent->fat_inode = MSDOS_SB(sb)->fat_inode;
bhs[0] = sb_bread(sb, blocknr); bhs[0] = sb_bread(sb, blocknr);
if (!bhs[0]) if (!bhs[0])
goto err; goto err;
@ -103,6 +105,7 @@ static int fat_ent_bread(struct super_block *sb, struct fat_entry *fatent,
struct fatent_operations *ops = MSDOS_SB(sb)->fatent_ops; struct fatent_operations *ops = MSDOS_SB(sb)->fatent_ops;
WARN_ON(blocknr < MSDOS_SB(sb)->fat_start); WARN_ON(blocknr < MSDOS_SB(sb)->fat_start);
fatent->fat_inode = MSDOS_SB(sb)->fat_inode;
fatent->bhs[0] = sb_bread(sb, blocknr); fatent->bhs[0] = sb_bread(sb, blocknr);
if (!fatent->bhs[0]) { if (!fatent->bhs[0]) {
printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n", printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n",
@ -167,9 +170,9 @@ static void fat12_ent_put(struct fat_entry *fatent, int new)
} }
spin_unlock(&fat12_entry_lock); spin_unlock(&fat12_entry_lock);
mark_buffer_dirty(fatent->bhs[0]); mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
if (fatent->nr_bhs == 2) if (fatent->nr_bhs == 2)
mark_buffer_dirty(fatent->bhs[1]); mark_buffer_dirty_inode(fatent->bhs[1], fatent->fat_inode);
} }
static void fat16_ent_put(struct fat_entry *fatent, int new) static void fat16_ent_put(struct fat_entry *fatent, int new)
@ -178,7 +181,7 @@ static void fat16_ent_put(struct fat_entry *fatent, int new)
new = EOF_FAT16; new = EOF_FAT16;
*fatent->u.ent16_p = cpu_to_le16(new); *fatent->u.ent16_p = cpu_to_le16(new);
mark_buffer_dirty(fatent->bhs[0]); mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
} }
static void fat32_ent_put(struct fat_entry *fatent, int new) static void fat32_ent_put(struct fat_entry *fatent, int new)
@ -189,7 +192,7 @@ static void fat32_ent_put(struct fat_entry *fatent, int new)
WARN_ON(new & 0xf0000000); WARN_ON(new & 0xf0000000);
new |= le32_to_cpu(*fatent->u.ent32_p) & ~0x0fffffff; new |= le32_to_cpu(*fatent->u.ent32_p) & ~0x0fffffff;
*fatent->u.ent32_p = cpu_to_le32(new); *fatent->u.ent32_p = cpu_to_le32(new);
mark_buffer_dirty(fatent->bhs[0]); mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
} }
static int fat12_ent_next(struct fat_entry *fatent) static int fat12_ent_next(struct fat_entry *fatent)
@ -381,7 +384,7 @@ static int fat_mirror_bhs(struct super_block *sb, struct buffer_head **bhs,
} }
memcpy(c_bh->b_data, bhs[n]->b_data, sb->s_blocksize); memcpy(c_bh->b_data, bhs[n]->b_data, sb->s_blocksize);
set_buffer_uptodate(c_bh); set_buffer_uptodate(c_bh);
mark_buffer_dirty(c_bh); mark_buffer_dirty_inode(c_bh, sbi->fat_inode);
if (sb->s_flags & MS_SYNCHRONOUS) if (sb->s_flags & MS_SYNCHRONOUS)
err = sync_dirty_buffer(c_bh); err = sync_dirty_buffer(c_bh);
brelse(c_bh); brelse(c_bh);

14
fs/fat/file.c
View File

@ -133,6 +133,18 @@ static int fat_file_release(struct inode *inode, struct file *filp)
return 0; return 0;
} }
int fat_file_fsync(struct file *filp, struct dentry *dentry, int datasync)
{
struct inode *inode = dentry->d_inode;
int res, err;
res = simple_fsync(filp, dentry, datasync);
err = sync_mapping_buffers(MSDOS_SB(inode->i_sb)->fat_inode->i_mapping);
return res ? res : err;
}
const struct file_operations fat_file_operations = { const struct file_operations fat_file_operations = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read = do_sync_read, .read = do_sync_read,
@ -142,7 +154,7 @@ const struct file_operations fat_file_operations = {
.mmap = generic_file_mmap, .mmap = generic_file_mmap,
.release = fat_file_release, .release = fat_file_release,
.ioctl = fat_generic_ioctl, .ioctl = fat_generic_ioctl,
.fsync = file_fsync, .fsync = fat_file_fsync,
.splice_read = generic_file_splice_read, .splice_read = generic_file_splice_read,
}; };

11
fs/fat/inode.c
View File

@ -458,6 +458,8 @@ static void fat_put_super(struct super_block *sb)
if (sb->s_dirt) if (sb->s_dirt)
fat_write_super(sb); fat_write_super(sb);
iput(sbi->fat_inode);
if (sbi->nls_disk) { if (sbi->nls_disk) {
unload_nls(sbi->nls_disk); unload_nls(sbi->nls_disk);
sbi->nls_disk = NULL; sbi->nls_disk = NULL;
@ -1183,7 +1185,7 @@ static int fat_read_root(struct inode *inode)
int fat_fill_super(struct super_block *sb, void *data, int silent, int fat_fill_super(struct super_block *sb, void *data, int silent,
const struct inode_operations *fs_dir_inode_ops, int isvfat) const struct inode_operations *fs_dir_inode_ops, int isvfat)
{ {
struct inode *root_inode = NULL; struct inode *root_inode = NULL, *fat_inode = NULL;
struct buffer_head *bh; struct buffer_head *bh;
struct fat_boot_sector *b; struct fat_boot_sector *b;
struct msdos_sb_info *sbi; struct msdos_sb_info *sbi;
@ -1423,6 +1425,11 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
} }
error = -ENOMEM; error = -ENOMEM;
fat_inode = new_inode(sb);
if (!fat_inode)
goto out_fail;
MSDOS_I(fat_inode)->i_pos = 0;
sbi->fat_inode = fat_inode;
root_inode = new_inode(sb); root_inode = new_inode(sb);
if (!root_inode) if (!root_inode)
goto out_fail; goto out_fail;
@ -1448,6 +1455,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
" on dev %s.\n", sb->s_id); " on dev %s.\n", sb->s_id);
out_fail: out_fail:
if (fat_inode)
iput(fat_inode);
if (root_inode) if (root_inode)
iput(root_inode); iput(root_inode);
if (sbi->nls_io) if (sbi->nls_io)

4
fs/fat/namei_msdos.c
View File

@ -544,7 +544,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
int start = MSDOS_I(new_dir)->i_logstart; int start = MSDOS_I(new_dir)->i_logstart;
dotdot_de->start = cpu_to_le16(start); dotdot_de->start = cpu_to_le16(start);
dotdot_de->starthi = cpu_to_le16(start >> 16); dotdot_de->starthi = cpu_to_le16(start >> 16);
mark_buffer_dirty(dotdot_bh); mark_buffer_dirty_inode(dotdot_bh, old_inode);
if (IS_DIRSYNC(new_dir)) { if (IS_DIRSYNC(new_dir)) {
err = sync_dirty_buffer(dotdot_bh); err = sync_dirty_buffer(dotdot_bh);
if (err) if (err)
@ -586,7 +586,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
int start = MSDOS_I(old_dir)->i_logstart; int start = MSDOS_I(old_dir)->i_logstart;
dotdot_de->start = cpu_to_le16(start); dotdot_de->start = cpu_to_le16(start);
dotdot_de->starthi = cpu_to_le16(start >> 16); dotdot_de->starthi = cpu_to_le16(start >> 16);
mark_buffer_dirty(dotdot_bh); mark_buffer_dirty_inode(dotdot_bh, old_inode);
corrupt |= sync_dirty_buffer(dotdot_bh); corrupt |= sync_dirty_buffer(dotdot_bh);
} }
error_inode: error_inode:

4
fs/fat/namei_vfat.c
View File

@ -965,7 +965,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
int start = MSDOS_I(new_dir)->i_logstart; int start = MSDOS_I(new_dir)->i_logstart;
dotdot_de->start = cpu_to_le16(start); dotdot_de->start = cpu_to_le16(start);
dotdot_de->starthi = cpu_to_le16(start >> 16); dotdot_de->starthi = cpu_to_le16(start >> 16);
mark_buffer_dirty(dotdot_bh); mark_buffer_dirty_inode(dotdot_bh, old_inode);
if (IS_DIRSYNC(new_dir)) { if (IS_DIRSYNC(new_dir)) {
err = sync_dirty_buffer(dotdot_bh); err = sync_dirty_buffer(dotdot_bh);
if (err) if (err)
@ -1009,7 +1009,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
int start = MSDOS_I(old_dir)->i_logstart; int start = MSDOS_I(old_dir)->i_logstart;
dotdot_de->start = cpu_to_le16(start); dotdot_de->start = cpu_to_le16(start);
dotdot_de->starthi = cpu_to_le16(start >> 16); dotdot_de->starthi = cpu_to_le16(start >> 16);
mark_buffer_dirty(dotdot_bh); mark_buffer_dirty_inode(dotdot_bh, old_inode);
corrupt |= sync_dirty_buffer(dotdot_bh); corrupt |= sync_dirty_buffer(dotdot_bh);
} }
error_inode: error_inode: