diff options
Diffstat (limited to 'fs/reiserfs/namei.c')
-rw-r--r-- | fs/reiserfs/namei.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index 8f8d8d01107c..c8123308e060 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c | |||
@@ -456,7 +456,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, | |||
456 | /* get memory for composing the entry */ | 456 | /* get memory for composing the entry */ |
457 | buflen = DEH_SIZE + ROUND_UP(namelen); | 457 | buflen = DEH_SIZE + ROUND_UP(namelen); |
458 | if (buflen > sizeof(small_buf)) { | 458 | if (buflen > sizeof(small_buf)) { |
459 | buffer = reiserfs_kmalloc(buflen, GFP_NOFS, dir->i_sb); | 459 | buffer = kmalloc(buflen, GFP_NOFS); |
460 | if (buffer == 0) | 460 | if (buffer == 0) |
461 | return -ENOMEM; | 461 | return -ENOMEM; |
462 | } else | 462 | } else |
@@ -490,7 +490,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, | |||
490 | retval = reiserfs_find_entry(dir, name, namelen, &path, &de); | 490 | retval = reiserfs_find_entry(dir, name, namelen, &path, &de); |
491 | if (retval != NAME_NOT_FOUND) { | 491 | if (retval != NAME_NOT_FOUND) { |
492 | if (buffer != small_buf) | 492 | if (buffer != small_buf) |
493 | reiserfs_kfree(buffer, buflen, dir->i_sb); | 493 | kfree(buffer); |
494 | pathrelse(&path); | 494 | pathrelse(&path); |
495 | 495 | ||
496 | if (retval == IO_ERROR) { | 496 | if (retval == IO_ERROR) { |
@@ -515,7 +515,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, | |||
515 | reiserfs_warning(dir->i_sb, | 515 | reiserfs_warning(dir->i_sb, |
516 | "reiserfs_add_entry: Congratulations! we have got hash function screwed up"); | 516 | "reiserfs_add_entry: Congratulations! we have got hash function screwed up"); |
517 | if (buffer != small_buf) | 517 | if (buffer != small_buf) |
518 | reiserfs_kfree(buffer, buflen, dir->i_sb); | 518 | kfree(buffer); |
519 | pathrelse(&path); | 519 | pathrelse(&path); |
520 | return -EBUSY; | 520 | return -EBUSY; |
521 | } | 521 | } |
@@ -535,7 +535,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, | |||
535 | &entry_key); | 535 | &entry_key); |
536 | 536 | ||
537 | if (buffer != small_buf) | 537 | if (buffer != small_buf) |
538 | reiserfs_kfree(buffer, buflen, dir->i_sb); | 538 | kfree(buffer); |
539 | pathrelse(&path); | 539 | pathrelse(&path); |
540 | return -EBUSY; | 540 | return -EBUSY; |
541 | } | 541 | } |
@@ -546,7 +546,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, | |||
546 | reiserfs_paste_into_item(th, &path, &entry_key, dir, buffer, | 546 | reiserfs_paste_into_item(th, &path, &entry_key, dir, buffer, |
547 | paste_size); | 547 | paste_size); |
548 | if (buffer != small_buf) | 548 | if (buffer != small_buf) |
549 | reiserfs_kfree(buffer, buflen, dir->i_sb); | 549 | kfree(buffer); |
550 | if (retval) { | 550 | if (retval) { |
551 | reiserfs_check_path(&path); | 551 | reiserfs_check_path(&path); |
552 | return retval; | 552 | return retval; |
@@ -1065,7 +1065,7 @@ static int reiserfs_symlink(struct inode *parent_dir, | |||
1065 | goto out_failed; | 1065 | goto out_failed; |
1066 | } | 1066 | } |
1067 | 1067 | ||
1068 | name = reiserfs_kmalloc(item_len, GFP_NOFS, parent_dir->i_sb); | 1068 | name = kmalloc(item_len, GFP_NOFS); |
1069 | if (!name) { | 1069 | if (!name) { |
1070 | drop_new_inode(inode); | 1070 | drop_new_inode(inode); |
1071 | retval = -ENOMEM; | 1071 | retval = -ENOMEM; |
@@ -1079,14 +1079,14 @@ static int reiserfs_symlink(struct inode *parent_dir, | |||
1079 | retval = journal_begin(&th, parent_dir->i_sb, jbegin_count); | 1079 | retval = journal_begin(&th, parent_dir->i_sb, jbegin_count); |
1080 | if (retval) { | 1080 | if (retval) { |
1081 | drop_new_inode(inode); | 1081 | drop_new_inode(inode); |
1082 | reiserfs_kfree(name, item_len, parent_dir->i_sb); | 1082 | kfree(name); |
1083 | goto out_failed; | 1083 | goto out_failed; |
1084 | } | 1084 | } |
1085 | 1085 | ||
1086 | retval = | 1086 | retval = |
1087 | reiserfs_new_inode(&th, parent_dir, mode, name, strlen(symname), | 1087 | reiserfs_new_inode(&th, parent_dir, mode, name, strlen(symname), |
1088 | dentry, inode); | 1088 | dentry, inode); |
1089 | reiserfs_kfree(name, item_len, parent_dir->i_sb); | 1089 | kfree(name); |
1090 | if (retval) { /* reiserfs_new_inode iputs for us */ | 1090 | if (retval) { /* reiserfs_new_inode iputs for us */ |
1091 | goto out_failed; | 1091 | goto out_failed; |
1092 | } | 1092 | } |