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 /fs/ocfs2/dlm | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/ocfs2/dlm')
| -rw-r--r-- | fs/ocfs2/dlm/dlmfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c index ba962d71b34d..6f7a77d54020 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlm/dlmfs.c | |||
| @@ -339,8 +339,8 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb) | |||
| 339 | ip = DLMFS_I(inode); | 339 | ip = DLMFS_I(inode); |
| 340 | 340 | ||
| 341 | inode->i_mode = mode; | 341 | inode->i_mode = mode; |
| 342 | inode->i_uid = current->fsuid; | 342 | inode->i_uid = current_fsuid(); |
| 343 | inode->i_gid = current->fsgid; | 343 | inode->i_gid = current_fsgid(); |
| 344 | inode->i_blocks = 0; | 344 | inode->i_blocks = 0; |
| 345 | inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info; | 345 | inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info; |
| 346 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 346 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
| @@ -365,8 +365,8 @@ static struct inode *dlmfs_get_inode(struct inode *parent, | |||
| 365 | return NULL; | 365 | return NULL; |
| 366 | 366 | ||
| 367 | inode->i_mode = mode; | 367 | inode->i_mode = mode; |
| 368 | inode->i_uid = current->fsuid; | 368 | inode->i_uid = current_fsuid(); |
| 369 | inode->i_gid = current->fsgid; | 369 | inode->i_gid = current_fsgid(); |
| 370 | inode->i_blocks = 0; | 370 | inode->i_blocks = 0; |
| 371 | inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info; | 371 | inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info; |
| 372 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 372 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |