shmem_symlink is okay, but I prefer the 2.5/ac ordering, which leaves
instantiation until the end: and is better for layering the next patch.
--- tmpfs1/mm/shmem.c Sat Sep 14 18:21:23 2002
+++ tmpfs2/mm/shmem.c Sat Sep 14 18:21:23 2002
@@ -1147,42 +1147,38 @@
static int shmem_symlink(struct inode * dir, struct dentry *dentry, const char * symname)
{
- int error;
int len;
struct inode *inode;
struct page *page;
char *kaddr;
struct shmem_inode_info * info;
- error = shmem_mknod(dir, dentry, S_IFLNK | S_IRWXUGO, 0);
- if (error)
- return error;
-
len = strlen(symname) + 1;
- inode = dentry->d_inode;
+ if (len > PAGE_CACHE_SIZE)
+ return -ENAMETOOLONG;
+
+ inode = shmem_get_inode(dir->i_sb, S_IFLNK|S_IRWXUGO, 0);
+ if (!inode)
+ return -ENOSPC;
+
info = SHMEM_I(inode);
inode->i_size = len-1;
- inode->i_op = &shmem_symlink_inline_operations;
-
if (len <= sizeof(struct shmem_inode_info)) {
/* do it inline */
memcpy(info, symname, len);
+ inode->i_op = &shmem_symlink_inline_operations;
} else {
- if (len > PAGE_CACHE_SIZE) {
- error = -ENAMETOOLONG;
- goto rmnod;
- }
- inode->i_op = &shmem_symlink_inode_operations;
- spin_lock (&shmem_ilock);
- list_add_tail(&info->list, &shmem_inodes);
- spin_unlock (&shmem_ilock);
down(&info->sem);
page = shmem_getpage_locked(info, inode, 0);
if (IS_ERR(page)) {
up(&info->sem);
- error = PTR_ERR(page);
- goto rmnod;
+ iput(inode);
+ return PTR_ERR(page);
}
+ inode->i_op = &shmem_symlink_inode_operations;
+ spin_lock (&shmem_ilock);
+ list_add_tail(&info->list, &shmem_inodes);
+ spin_unlock (&shmem_ilock);
kaddr = kmap(page);
memcpy(kaddr, symname, len);
kunmap(page);
@@ -1192,12 +1188,9 @@
up(&info->sem);
}
dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+ d_instantiate(dentry, inode);
+ dget(dentry);
return 0;
-
-rmnod:
- if (!shmem_unlink(dir, dentry))
- d_delete(dentry);
- return error;
}
static int shmem_readlink_inline(struct dentry *dentry, char *buffer, int buflen)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Sep 15 2002 - 22:00:37 EST