Merge branch 'linus' into timers/hrtimers

Conflicts:
	sound/drivers/pcsp/pcsp.c

Semantic conflict:

        sound/core/hrtimer.c

1 files changed, 2 insertions, 2 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)
         }
         mutex_unlock(&sbi->s_alloc_mutex);
         inode->i_mode = mode;
-        inode->i_uid = current->fsuid;
+        inode->i_uid = current_fsuid();
         if (dir->i_mode & S_ISGID) {
                 inode->i_gid = dir->i_gid;
                 if (S_ISDIR(mode))
                         mode |= S_ISGID;
         } else {
-                inode->i_gid = current->fsgid;
+                inode->i_gid = current_fsgid();
         }
 
         iinfo->i_location.logicalBlockNum = block;