diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-13 23:49:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-13 23:49:37 -0400 |
| commit | 9921b256bb7402143a5bf0b722582562b6485eb8 (patch) | |
| tree | f30bc9ed896a65c7e891919547165dc3c02393c1 /fs/xfs/xfs_inode.c | |
| parent | 7a49efae71397cf7e9299bbb22b2d12f7cf12428 (diff) | |
| parent | 9e2b2dc4133f65272a6d3c5dcb2ce63f8a87cae9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
CRED: Introduce credential access wrappers
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 358511b85ced..00e80df9dd9d 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
| @@ -1081,8 +1081,8 @@ xfs_ialloc( | |||
| 1081 | ip->i_d.di_onlink = 0; | 1081 | ip->i_d.di_onlink = 0; |
| 1082 | ip->i_d.di_nlink = nlink; | 1082 | ip->i_d.di_nlink = nlink; |
| 1083 | ASSERT(ip->i_d.di_nlink == nlink); | 1083 | ASSERT(ip->i_d.di_nlink == nlink); |
| 1084 | ip->i_d.di_uid = current_fsuid(cr); | 1084 | ip->i_d.di_uid = current_fsuid(); |
| 1085 | ip->i_d.di_gid = current_fsgid(cr); | 1085 | ip->i_d.di_gid = current_fsgid(); |
| 1086 | ip->i_d.di_projid = prid; | 1086 | ip->i_d.di_projid = prid; |
| 1087 | memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); | 1087 | memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); |
| 1088 | 1088 | ||