X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2Fminix%2Fbitmap.c;h=3aebe322271a67cbe7abd5dd738f6ec9a88a981a;hb=b1792e367053968f2ddb48bc911d314143ce6242;hp=99a12f12776965e622a547030018bcf47a46d153;hpb=3334500b460a5eede2e3466ca97a90fe3b91ceb5;p=karo-tx-linux.git

diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c
index 99a12f127769..3aebe322271a 100644
--- a/fs/minix/bitmap.c
+++ b/fs/minix/bitmap.c
@@ -17,7 +17,7 @@
 #include <linux/bitops.h>
 #include <linux/sched.h>
 
-static int nibblemap[] = { 4,3,3,2,3,2,2,1,3,2,2,1,2,1,1,0 };
+static const int nibblemap[] = { 4,3,3,2,3,2,2,1,3,2,2,1,2,1,1,0 };
 
 static unsigned long count_free(struct buffer_head *map[], unsigned numblocks, __u32 numbits)
 {
@@ -262,8 +262,8 @@ struct inode * minix_new_inode(const struct inode * dir, int * error)
 		iput(inode);
 		return NULL;
 	}
-	inode->i_uid = current->fsuid;
-	inode->i_gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
+	inode->i_uid = current_fsuid();
+	inode->i_gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current_fsgid();
 	inode->i_ino = j;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
 	inode->i_blocks = 0;