diff options
| author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
| commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
| tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /drivers/usb/core/inode.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/usb/core/inode.c')
| -rw-r--r-- | drivers/usb/core/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c index 94632264dcc..185be760833 100644 --- a/drivers/usb/core/inode.c +++ b/drivers/usb/core/inode.c | |||
| @@ -277,8 +277,8 @@ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, dev_t de | |||
| 277 | 277 | ||
| 278 | if (inode) { | 278 | if (inode) { |
| 279 | inode->i_mode = mode; | 279 | inode->i_mode = mode; |
| 280 | inode->i_uid = current->fsuid; | 280 | inode->i_uid = current_fsuid(); |
| 281 | inode->i_gid = current->fsgid; | 281 | inode->i_gid = current_fsgid(); |
| 282 | inode->i_blocks = 0; | 282 | inode->i_blocks = 0; |
| 283 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 283 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
| 284 | switch (mode & S_IFMT) { | 284 | switch (mode & S_IFMT) { |