diff options
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/ialloc.c | 4 | ||||
| -rw-r--r-- | fs/udf/namei.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c index a4f2b3ce45b0..31fc84297ddb 100644 --- a/fs/udf/ialloc.c +++ b/fs/udf/ialloc.c | |||
| @@ -126,13 +126,13 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) | |||
| 126 | } | 126 | } |
| 127 | mutex_unlock(&sbi->s_alloc_mutex); | 127 | mutex_unlock(&sbi->s_alloc_mutex); |
| 128 | inode->i_mode = mode; | 128 | inode->i_mode = mode; |
| 129 | inode->i_uid = current->fsuid; | 129 | inode->i_uid = current_fsuid(); |
| 130 | if (dir->i_mode & S_ISGID) { | 130 | if (dir->i_mode & S_ISGID) { |
| 131 | inode->i_gid = dir->i_gid; | 131 | inode->i_gid = dir->i_gid; |
| 132 | if (S_ISDIR(mode)) | 132 | if (S_ISDIR(mode)) |
| 133 | mode |= S_ISGID; | 133 | mode |= S_ISGID; |
| 134 | } else { | 134 | } else { |
| 135 | inode->i_gid = current->fsgid; | 135 | inode->i_gid = current_fsgid(); |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | iinfo->i_location.logicalBlockNum = block; | 138 | iinfo->i_location.logicalBlockNum = block; |
diff --git a/fs/udf/namei.c b/fs/udf/namei.c index 082409cd4b8a..f84bfaa8d941 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c | |||
| @@ -604,7 +604,7 @@ static int udf_mknod(struct inode *dir, struct dentry *dentry, int mode, | |||
| 604 | goto out; | 604 | goto out; |
| 605 | 605 | ||
| 606 | iinfo = UDF_I(inode); | 606 | iinfo = UDF_I(inode); |
| 607 | inode->i_uid = current->fsuid; | 607 | inode->i_uid = current_fsuid(); |
| 608 | init_special_inode(inode, mode, rdev); | 608 | init_special_inode(inode, mode, rdev); |
| 609 | fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err); | 609 | fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err); |
| 610 | if (!fi) { | 610 | if (!fi) { |
