dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ocfs2: Cleanup dirent size check 

The check to see if a new dirent would fit in an old one is pretty ugly, and
it's done at least twice. Clean things up by putting this in it's own
easier-to-read function.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Reviewed-by: Joel Becker <joel.becker@oracle.com>
This commit is contained in:
Mark Fasheh 2007-09-13 16:29:01 -07:00
parent 38760e2432
commit 8553cf4f36
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/ocfs2/dir.c
View File

@ -343,6 +343,31 @@ bail:
return status;
}
/*
* Check whether 'de' has enough room to hold an entry of
* 'new_rec_len' bytes.
*/
static inline int ocfs2_dirent_would_fit(struct ocfs2_dir_entry *de,
unsigned int new_rec_len)
{
unsigned int de_really_used;
/* Check whether this is an empty record with enough space */
if (le64_to_cpu(de->inode) == 0 &&
le16_to_cpu(de->rec_len) >= new_rec_len)
return 1;
/*
* Record might have free space at the end which we can
* use.
*/
de_really_used = OCFS2_DIR_REC_LEN(de->name_len);
if (le16_to_cpu(de->rec_len) >= (de_really_used + new_rec_len))
return 1;
return 0;
}
/* we don't always have a dentry for what we want to add, so people
* like orphan dir can call this instead.
*
@ -385,10 +410,8 @@ int __ocfs2_add_entry(handle_t *handle,
retval = -EEXIST;
goto bail;
}
if (((le64_to_cpu(de->inode) == 0) &&
(le16_to_cpu(de->rec_len) >= rec_len)) ||
(le16_to_cpu(de->rec_len) >=
(OCFS2_DIR_REC_LEN(de->name_len) + rec_len))) {
if (ocfs2_dirent_would_fit(de, rec_len)) {
dir->i_mtime = dir->i_ctime = CURRENT_TIME;
retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh);
if (retval < 0) {
@ -1078,10 +1101,7 @@ int ocfs2_prepare_dir_for_insert(struct ocfs2_super *osb,
status = -EEXIST;
goto bail;
}
if (((le64_to_cpu(de->inode) == 0) &&
(le16_to_cpu(de->rec_len) >= rec_len)) ||
(le16_to_cpu(de->rec_len) >=
(OCFS2_DIR_REC_LEN(de->name_len) + rec_len))) {
if (ocfs2_dirent_would_fit(de, rec_len)) {
/* Ok, we found a spot. Return this bh and let
* the caller actually fill it in. */
*ret_de_bh = bh;