From 72fe668abb4a3949e36644f86c12a025825c2e58 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Sun, 15 Nov 2009 15:30:52 -0500 Subject: [PATCH] --- yaml --- r: 174373 b: refs/heads/master c: 86ebfd08a1930ccedb8eac0aeb1ed4b8b6a41dbc h: refs/heads/master i: 174371: 0f633be76ab1768c091956d9e43a46872ec9541e v: v3 --- [refs] | 2 +- trunk/fs/ext4/xattr.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e653914f05f5..d3a4777cf2f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30c6e07a92ea4cb87160d32ffa9bce172576ae4c +refs/heads/master: 86ebfd08a1930ccedb8eac0aeb1ed4b8b6a41dbc diff --git a/trunk/fs/ext4/xattr.c b/trunk/fs/ext4/xattr.c index fed5b01d7a8d..025701926f9a 100644 --- a/trunk/fs/ext4/xattr.c +++ b/trunk/fs/ext4/xattr.c @@ -988,6 +988,10 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, if (error) goto cleanup; + error = ext4_journal_get_write_access(handle, is.iloc.bh); + if (error) + goto cleanup; + if (EXT4_I(inode)->i_state & EXT4_STATE_NEW) { struct ext4_inode *raw_inode = ext4_raw_inode(&is.iloc); memset(raw_inode, 0, EXT4_SB(inode->i_sb)->s_inode_size); @@ -1013,9 +1017,6 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, if (flags & XATTR_CREATE) goto cleanup; } - error = ext4_journal_get_write_access(handle, is.iloc.bh); - if (error) - goto cleanup; if (!value) { if (!is.s.not_found) error = ext4_xattr_ibody_set(handle, inode, &i, &is);