git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[sfrench/cifs-2.6.git]
/
fs
/
ext4
/
ext4.h
diff --git
a/fs/ext4/ext4.h
b/fs/ext4/ext4.h
index decc15d1b4b645cc819b6eaf9382819190d06625..cfc4e01b3c8370c642681824ef55b13a66683c0d 100644
(file)
--- a/
fs/ext4/ext4.h
+++ b/
fs/ext4/ext4.h
@@
-1174,8
+1174,8
@@
struct ext4_sb_info {
unsigned int s_mount_flags;
unsigned int s_def_mount_opt;
ext4_fsblk_t s_sb_block;
- uid_t s_resuid;
- gid_t s_resgid;
+
k
uid_t s_resuid;
+
k
gid_t s_resgid;
unsigned short s_mount_state;
unsigned short s_pad;
int s_addr_per_block_bits;