Merge branch 'master' into next

[net-next-2.6.git] / fs / fat / file.c

diff --git a/fs/fat/file.c b/fs/fat/file.c
index f06a4e525eceff2b758ba0ff62ebd6e6f2fca9bb..0a7f4a9918b346d117a814b1911f11e1b72b22c7 100644 (file)
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -304,7 +304,7 @@ static int fat_allow_set_time(struct msdos_sb_info *sbi, struct inode *inode)
 {
        mode_t allow_utime = sbi->options.allow_utime;
 
-       if (current->fsuid != inode->i_uid) {
+       if (current_fsuid() != inode->i_uid) {
                if (in_group_p(inode->i_gid))
                        allow_utime >>= 3;
                if (allow_utime & MAY_WRITE)