diff options
| author | James Morris <jmorris@namei.org> | 2011-03-07 19:38:10 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-07 19:38:10 -0500 |
| commit | fe3fa43039d47ee4e22caf460b79b62a14937f79 (patch) | |
| tree | 9eab8d00f1227b9fe0959f32a62d892ed35803ba /fs/ext3/namei.c | |
| parent | ee009e4a0d4555ed522a631bae9896399674f064 (diff) | |
| parent | 026eb167ae77244458fa4b4b9fc171209c079ba7 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Diffstat (limited to 'fs/ext3/namei.c')
| -rw-r--r-- | fs/ext3/namei.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index b27ba71810ec..9dba3bd69d9a 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c | |||
| @@ -1710,7 +1710,7 @@ retry: | |||
| 1710 | if (IS_DIRSYNC(dir)) | 1710 | if (IS_DIRSYNC(dir)) |
| 1711 | handle->h_sync = 1; | 1711 | handle->h_sync = 1; |
| 1712 | 1712 | ||
| 1713 | inode = ext3_new_inode (handle, dir, mode); | 1713 | inode = ext3_new_inode (handle, dir, &dentry->d_name, mode); |
| 1714 | err = PTR_ERR(inode); | 1714 | err = PTR_ERR(inode); |
| 1715 | if (!IS_ERR(inode)) { | 1715 | if (!IS_ERR(inode)) { |
| 1716 | inode->i_op = &ext3_file_inode_operations; | 1716 | inode->i_op = &ext3_file_inode_operations; |
| @@ -1746,7 +1746,7 @@ retry: | |||
| 1746 | if (IS_DIRSYNC(dir)) | 1746 | if (IS_DIRSYNC(dir)) |
| 1747 | handle->h_sync = 1; | 1747 | handle->h_sync = 1; |
| 1748 | 1748 | ||
| 1749 | inode = ext3_new_inode (handle, dir, mode); | 1749 | inode = ext3_new_inode (handle, dir, &dentry->d_name, mode); |
| 1750 | err = PTR_ERR(inode); | 1750 | err = PTR_ERR(inode); |
| 1751 | if (!IS_ERR(inode)) { | 1751 | if (!IS_ERR(inode)) { |
| 1752 | init_special_inode(inode, inode->i_mode, rdev); | 1752 | init_special_inode(inode, inode->i_mode, rdev); |
| @@ -1784,7 +1784,7 @@ retry: | |||
| 1784 | if (IS_DIRSYNC(dir)) | 1784 | if (IS_DIRSYNC(dir)) |
| 1785 | handle->h_sync = 1; | 1785 | handle->h_sync = 1; |
| 1786 | 1786 | ||
| 1787 | inode = ext3_new_inode (handle, dir, S_IFDIR | mode); | 1787 | inode = ext3_new_inode (handle, dir, &dentry->d_name, S_IFDIR | mode); |
| 1788 | err = PTR_ERR(inode); | 1788 | err = PTR_ERR(inode); |
| 1789 | if (IS_ERR(inode)) | 1789 | if (IS_ERR(inode)) |
| 1790 | goto out_stop; | 1790 | goto out_stop; |
| @@ -2206,7 +2206,7 @@ retry: | |||
| 2206 | if (IS_DIRSYNC(dir)) | 2206 | if (IS_DIRSYNC(dir)) |
| 2207 | handle->h_sync = 1; | 2207 | handle->h_sync = 1; |
| 2208 | 2208 | ||
| 2209 | inode = ext3_new_inode (handle, dir, S_IFLNK|S_IRWXUGO); | 2209 | inode = ext3_new_inode (handle, dir, &dentry->d_name, S_IFLNK|S_IRWXUGO); |
| 2210 | err = PTR_ERR(inode); | 2210 | err = PTR_ERR(inode); |
| 2211 | if (IS_ERR(inode)) | 2211 | if (IS_ERR(inode)) |
| 2212 | goto out_stop; | 2212 | goto out_stop; |