diff options
| author | Badari Pulavarty <pbadari@us.ibm.com> | 2006-10-11 01:21:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:14:17 -0700 |
| commit | a1ddeb7eaecea6a924e3a79aa386797020cb436f (patch) | |
| tree | aa044e5447394097b9a6e8d1222988ba50d3b8b5 /fs | |
| parent | 299717696d48531d70aeb4614c3939e4a28456c1 (diff) | |
| download | linux-3.10-a1ddeb7eaecea6a924e3a79aa386797020cb436f.tar.gz linux-3.10-a1ddeb7eaecea6a924e3a79aa386797020cb436f.tar.bz2 linux-3.10-a1ddeb7eaecea6a924e3a79aa386797020cb436f.zip | |
[PATCH] ext4: 48bit i_file_acl
As we are planning to support 48-bit block numbers for ext4, we need to
support 48-bit block numbers for extended attributes. In the short term, we
can do this by reuse (on-disk) 16-bit padding (linux2.i_pad1 currently used
only by "hurd") as high order bits for xattr. This patch basically does that.
Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 2b81b1324a6..9db8cff3baa 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2643,6 +2643,11 @@ void ext4_read_inode(struct inode * inode) ei->i_frag_size = raw_inode->i_fsize; #endif ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl); + if ((sizeof(sector_t) > 4) && + (EXT4_SB(inode->i_sb)->s_es->s_creator_os != + cpu_to_le32(EXT4_OS_HURD))) + ei->i_file_acl |= + ((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32; if (!S_ISREG(inode->i_mode)) { ei->i_dir_acl = le32_to_cpu(raw_inode->i_dir_acl); } else { @@ -2776,6 +2781,11 @@ static int ext4_do_update_inode(handle_t *handle, raw_inode->i_frag = ei->i_frag_no; raw_inode->i_fsize = ei->i_frag_size; #endif + if ((sizeof(sector_t) > 4) && + (EXT4_SB(inode->i_sb)->s_es->s_creator_os != + cpu_to_le32(EXT4_OS_HURD))) + raw_inode->i_file_acl_high = + cpu_to_le16(ei->i_file_acl >> 32); raw_inode->i_file_acl = cpu_to_le32(ei->i_file_acl); if (!S_ISREG(inode->i_mode)) { raw_inode->i_dir_acl = cpu_to_le32(ei->i_dir_acl); |