Commit fd4588d0 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://jfs.bkbits.net/linux-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents db469c8d cb36441a
......@@ -399,8 +399,6 @@ int jfs_rmdir(struct inode *dip, struct dentry *dentry)
IWRITE_UNLOCK(dip);
d_delete(dentry);
out2:
free_UCSname(&dname);
......@@ -543,8 +541,6 @@ int jfs_unlink(struct inode *dip, struct dentry *dentry)
IWRITE_UNLOCK(dip);
d_delete(dentry);
out1:
free_UCSname(&dname);
out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment