[Ocfs2-devel] [PATCH 09/13] ocfs2: Take ocfs2_xattr_bucket structures off of the stack.

[Joel Becker]

On Tue, Oct 28, 2008 at 10:24:38AM +0800, Tao Ma wrote:
> Joel Becker wrote:
>> The ocfs2_xattr_bucket structure is a nice abstraction, but it is a bit
>> large to have on the stack.  Just like ocfs2_path, let's allocate it
>> with a ocfs2_xattr_bucket_new() function.
>> We can now store the inode on the bucket, cleaning up all the other
>> bucket functions.  While we're here, we catch another place or two that
>> wasn't using ocfs2_read_xattr_bucket().
>> Signed-off-by: Joel Becker <joel.becker at oracle.com>
>
>
>> @@ -2042,6 +2074,18 @@ int ocfs2_xattr_set(struct inode *inode,
>>  	if (!ocfs2_supports_xattr(OCFS2_SB(inode->i_sb)))
>>  		return -EOPNOTSUPP;
>>  +	xis.bucket = ocfs2_xattr_bucket_new(inode);
>> +	if (!xis.bucket) {
>> +		mlog_errno(-ENOMEM);
>> +		return -ENOMEM;
>> +	}
> xis is used for xattr search in inode, so we don't need to allocate bucket.

	There is code lower down that I assume any xattr_search has a
bucket.  If we guarantee that xis will never get into that code, then we
don't need to allocate.

>> +	xbs.bucket = ocfs2_xattr_bucket_new(inode);
>> +	if (!xbs.bucket) {
>> +		ocfs2_xattr_bucket_free(xbs.bucket);
>> +		mlog_errno(-ENOMEM);
>> +		return -ENOMEM;
>> +	}
> can we allocate this only when we really need this? that means we may 
> allocate it in ocfs2_create_index_block(when we create a new one) and 
> ocfs2_xattr_index_block_find if there is some buckets exist?

	Because functions that xbs is passed to seem to assume the
bucket exists, I did it here.  We could allocate it later, but we'd have
to audit the code paths.

Joel

-- 

Life's Little Instruction Book #314

	"Never underestimate the power of forgiveness."

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127