Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

hfsplus: Add error propagation for hfsplus_ext_write_extent_locked

Browse Source 
Implement error propagation through the callers of
hfsplus_ext_write_extent_locked().

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Alexey Khoroshilov 2011-07-06 02:30:00 +04:00 committed by Christoph Hellwig
parent 5bd9d99d10
commit dd7f3d5458
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/hfsplus/extents.c
View File

@ -119,23 +119,31 @@ static void __hfsplus_ext_write_extent(struct inode *inode,
set_bit(HFSPLUS_I_EXT_DIRTY, &hip->flags); set_bit(HFSPLUS_I_EXT_DIRTY, &hip->flags);
} }
static void hfsplus_ext_write_extent_locked(struct inode *inode) static int hfsplus_ext_write_extent_locked(struct inode *inode)
{ {
int res;
if (HFSPLUS_I(inode)->extent_state & HFSPLUS_EXT_DIRTY) { if (HFSPLUS_I(inode)->extent_state & HFSPLUS_EXT_DIRTY) {
struct hfs_find_data fd; struct hfs_find_data fd;
if (!hfs_find_init(HFSPLUS_SB(inode->i_sb)->ext_tree, &fd)) { res = hfs_find_init(HFSPLUS_SB(inode->i_sb)->ext_tree, &fd);
__hfsplus_ext_write_extent(inode, &fd); if (res)
hfs_find_exit(&fd); return res;
} __hfsplus_ext_write_extent(inode, &fd);
hfs_find_exit(&fd);
} }
return 0;
} }
void hfsplus_ext_write_extent(struct inode *inode) int hfsplus_ext_write_extent(struct inode *inode)
{ {
int res;
mutex_lock(&HFSPLUS_I(inode)->extents_lock); mutex_lock(&HFSPLUS_I(inode)->extents_lock);
hfsplus_ext_write_extent_locked(inode); res = hfsplus_ext_write_extent_locked(inode);
mutex_unlock(&HFSPLUS_I(inode)->extents_lock); mutex_unlock(&HFSPLUS_I(inode)->extents_lock);
return res;
} }
static inline int __hfsplus_ext_read_extent(struct hfs_find_data *fd, static inline int __hfsplus_ext_read_extent(struct hfs_find_data *fd,
@ -477,7 +485,9 @@ out:
insert_extent: insert_extent:
dprint(DBG_EXTENT, "insert new extent\n"); dprint(DBG_EXTENT, "insert new extent\n");
hfsplus_ext_write_extent_locked(inode); res = hfsplus_ext_write_extent_locked(inode);
if (res)
goto out;
memset(hip->cached_extents, 0, sizeof(hfsplus_extent_rec)); memset(hip->cached_extents, 0, sizeof(hfsplus_extent_rec));
hip->cached_extents[0].start_block = cpu_to_be32(start); hip->cached_extents[0].start_block = cpu_to_be32(start);

2
fs/hfsplus/hfsplus_fs.h
View File

@ -374,7 +374,7 @@ extern const struct file_operations hfsplus_dir_operations;
/* extents.c */ /* extents.c */
int hfsplus_ext_cmp_key(const hfsplus_btree_key *, const hfsplus_btree_key *); int hfsplus_ext_cmp_key(const hfsplus_btree_key *, const hfsplus_btree_key *);
void hfsplus_ext_write_extent(struct inode *); int hfsplus_ext_write_extent(struct inode *);
int hfsplus_get_block(struct inode *, sector_t, struct buffer_head *, int); int hfsplus_get_block(struct inode *, sector_t, struct buffer_head *, int);
int hfsplus_free_fork(struct super_block *, u32, int hfsplus_free_fork(struct super_block *, u32,
struct hfsplus_fork_raw *, int); struct hfsplus_fork_raw *, int);

6
fs/hfsplus/super.c
View File

@ -135,9 +135,13 @@ static int hfsplus_system_write_inode(struct inode *inode)
static int hfsplus_write_inode(struct inode *inode, static int hfsplus_write_inode(struct inode *inode,
struct writeback_control *wbc) struct writeback_control *wbc)
{ {
int err;
dprint(DBG_INODE, "hfsplus_write_inode: %lu\n", inode->i_ino); dprint(DBG_INODE, "hfsplus_write_inode: %lu\n", inode->i_ino);
hfsplus_ext_write_extent(inode); err = hfsplus_ext_write_extent(inode);
if (err)
return err;
if (inode->i_ino >= HFSPLUS_FIRSTUSER_CNID || if (inode->i_ino >= HFSPLUS_FIRSTUSER_CNID ||
inode->i_ino == HFSPLUS_ROOT_CNID) inode->i_ino == HFSPLUS_ROOT_CNID)