Re: [PATCH 4/5] ext4 : Add missing posix_acl_release() in ext4_xattr_set_acl() in error path.

[Manish Katiyar <mkatiyar@gmail.com>]

On Mon, May 16, 2011 at 8:44 AM, Jan Kara <jack@suse.cz> wrote:
> On Thu 12-05-11 19:19:29, Manish Katiyar wrote:
>> On Wed, May 11, 2011 at 9:18 AM, Jan Kara <jack@suse.cz> wrote:
>> > On Sun 24-04-11 17:18:02, Manish Katiyar wrote:
>> >> This patch fixes the following.
>> >>
>> >> a) Incase journal transaction allocation fails due to ENOMEM don't call
>> >> ext4_std_error() since it will remount the fs as readonly and logs the
>> >> message in kernel log.
>> >> b) Call posix_acl_release() incase journal allocation fails in case of
>> >> error paths.
>> >>
>> >>
>> >> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
>> >> ---
>> >>  fs/ext4/acl.c |    7 ++++---
>> >>  1 files changed, 4 insertions(+), 3 deletions(-)
>> >>
>> >> diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
>> >> index 21eacd7..0c98710 100644
>> >> --- a/fs/ext4/acl.c
>> >> +++ b/fs/ext4/acl.c
>> >> @@ -354,7 +354,6 @@ ext4_acl_chmod(struct inode *inode)
>> >>                               EXT4_DATA_TRANS_BLOCKS(inode->i_sb));
>> >>               if (IS_ERR(handle)) {
>> >>                       error = PTR_ERR(handle);
>> >> -                     ext4_std_error(inode->i_sb, error);
>> >  The changelog speaks only about ENOMEM but you actually remove the
>> > message completely (so it won't catch EIO or similar errors). I think you
>> > should just condition ext4_std_error() with if (error != ENOMEM).
>>
>> Hi Jan,
>>
>> Thanks for your response. Here is the updated patch.
>>
>> ---------------------------------------------------------------------------------------------------------------------
>> a) Incase journal transaction allocation fails due to ENOMEM don't call
>> ext4_std_error() since it will remount the fs as readonly and logs the
>> message in kernel log.
>>
>> b) Call posix_acl_release() incase journal allocation fails in case
>> of error paths.
>  This patch looks OK now. You can add:
> Acked-by: Jan Kara <jack@suse.cz>

a) Incase journal transaction allocation
fails due to ENOMEM don't call ext4_std_error() since it will remount
the fs as readonly and logs the message in kernel log.

b) Call posix_acl_release() incase journal allocation fails in case
of error paths.

Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
Acked-by: Jan Kara <jack@suse.cz>
---
 fs/ext4/acl.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index 21eacd7..93dc9a6 100644
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -354,7 +354,8 @@ ext4_acl_chmod(struct inode *inode)
 				EXT4_DATA_TRANS_BLOCKS(inode->i_sb));
 		if (IS_ERR(handle)) {
 			error = PTR_ERR(handle);
-			ext4_std_error(inode->i_sb, error);
+			if (error != -ENOMEM)
+				ext4_std_error(inode->i_sb, error);
 			goto out;
 		}
 		error = ext4_set_acl(handle, inode, ACL_TYPE_ACCESS, clone);
@@ -450,8 +451,10 @@ ext4_xattr_set_acl(struct dentry *dentry, const
char *name, const void *value,

 retry:
 	handle = ext4_journal_start(inode, EXT4_DATA_TRANS_BLOCKS(inode->i_sb));
-	if (IS_ERR(handle))
-		return PTR_ERR(handle);
+	if (IS_ERR(handle)) {
+		error = PTR_ERR(handle);
+		goto release_and_out;
+	}
 	error = ext4_set_acl(handle, inode, type, acl);
 	ext4_journal_stop(handle);
 	if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
-- 
1.7.4.1


-- 
Thanks -
Manish
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html