From: Eric Sandeen Date: Wed, 26 Oct 2011 07:32:07 +0000 (-0400) Subject: ext4: use ext4_reserve_inode_write in ext4_xattr_set_handle X-Git-Tag: firefly_0821_release~3680^2~4229^2~33 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=665436175c3ca9d35f135e1ba6bdd63745cff08a;p=firefly-linux-kernel-4.4.55.git ext4: use ext4_reserve_inode_write in ext4_xattr_set_handle ext4_mark_iloc_dirty() says: * The caller must have previously called ext4_reserve_inode_write(). * Give this, we know that the caller already has write access to iloc->bh. ext4_xattr_set_handle, however, just open-codes it. May as well use the helper function for consistency. No bug here, just tidiness. (Note: on cleanup path, ext4_reserve_inode_write sets the bh to NULL if it returns an error, and brelse() of a null bh is handled gracefully). Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" --- diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index c757adc97250..0ae3668520f8 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -985,11 +985,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, no_expand = ext4_test_inode_state(inode, EXT4_STATE_NO_EXPAND); ext4_set_inode_state(inode, EXT4_STATE_NO_EXPAND); - error = ext4_get_inode_loc(inode, &is.iloc); - if (error) - goto cleanup; - - error = ext4_journal_get_write_access(handle, is.iloc.bh); + error = ext4_reserve_inode_write(handle, inode, &is.iloc); if (error) goto cleanup;