Skip to content
Snippets Groups Projects
Commit d8e623e3 authored by kalpak's avatar kalpak
Browse files 

b=16198
i=adilger
i=girish

correct inoptimal code during removal of xattr in SLES9/RHEL4
parent 7cd89450
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch
+ 52
− 56
View file @ d8e623e3
%patch %patch
Index: linux-2.6.0/fs/ext3/ialloc.c Index: linux-2.6.5-7.311/fs/ext3/ialloc.c
=================================================================== ===================================================================
--- linux-2.6.0.orig/fs/ext3/ialloc.c 2004-01-14 18:54:11.000000000 +0300 --- linux-2.6.5-7.311.orig/fs/ext3/ialloc.c
+++ linux-2.6.0/fs/ext3/ialloc.c 2004-01-14 18:54:12.000000000 +0300 +++ linux-2.6.5-7.311/fs/ext3/ialloc.c
@@ -627,6 +627,9 @@ @@ -633,6 +633,9 @@ got:
inode->i_generation = EXT3_SB(sb)->s_next_generation++; spin_unlock(&sbi->s_next_gen_lock);
ei->i_state = EXT3_STATE_NEW; ei->i_state = EXT3_STATE_NEW;
+ ei->i_extra_isize = + ei->i_extra_isize =
...@@ -13,11 +13,11 @@ Index: linux-2.6.0/fs/ext3/ialloc.c ...@@ -13,11 +13,11 @@ Index: linux-2.6.0/fs/ext3/ialloc.c
ret = inode; ret = inode;
if(DQUOT_ALLOC_INODE(inode)) { if(DQUOT_ALLOC_INODE(inode)) {
Index: linux-2.6.0/fs/ext3/inode.c Index: linux-2.6.5-7.311/fs/ext3/inode.c
=================================================================== ===================================================================
--- linux-2.6.0.orig/fs/ext3/inode.c 2004-01-14 18:54:12.000000000 +0300 --- linux-2.6.5-7.311.orig/fs/ext3/inode.c
+++ linux-2.6.0/fs/ext3/inode.c 2004-01-14 19:09:46.000000000 +0300 +++ linux-2.6.5-7.311/fs/ext3/inode.c
@@ -2339,7 +2339,7 @@ @@ -2284,7 +2284,7 @@ static unsigned long ext3_get_inode_bloc
* trying to determine the inode's location on-disk and no read need be * trying to determine the inode's location on-disk and no read need be
* performed. * performed.
*/ */
...@@ -26,7 +26,7 @@ Index: linux-2.6.0/fs/ext3/inode.c ...@@ -26,7 +26,7 @@ Index: linux-2.6.0/fs/ext3/inode.c
struct ext3_iloc *iloc, int in_mem) struct ext3_iloc *iloc, int in_mem)
{ {
unsigned long block; unsigned long block;
@@ -2547,6 +2547,11 @@ @@ -2495,6 +2495,11 @@ void ext3_read_inode(struct inode * inod
ei->i_data[block] = raw_inode->i_block[block]; ei->i_data[block] = raw_inode->i_block[block];
INIT_LIST_HEAD(&ei->i_orphan); INIT_LIST_HEAD(&ei->i_orphan);
...@@ -38,7 +38,7 @@ Index: linux-2.6.0/fs/ext3/inode.c ...@@ -38,7 +38,7 @@ Index: linux-2.6.0/fs/ext3/inode.c
if (S_ISREG(inode->i_mode)) { if (S_ISREG(inode->i_mode)) {
inode->i_op = &ext3_file_inode_operations; inode->i_op = &ext3_file_inode_operations;
inode->i_fop = &ext3_file_operations; inode->i_fop = &ext3_file_operations;
@@ -2682,6 +2687,9 @@ @@ -2630,6 +2635,9 @@ static int ext3_do_update_inode(handle_t
} else for (block = 0; block < EXT3_N_BLOCKS; block++) } else for (block = 0; block < EXT3_N_BLOCKS; block++)
raw_inode->i_block[block] = ei->i_data[block]; raw_inode->i_block[block] = ei->i_data[block];
...@@ -48,7 +48,7 @@ Index: linux-2.6.0/fs/ext3/inode.c ...@@ -48,7 +48,7 @@ Index: linux-2.6.0/fs/ext3/inode.c
BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata"); BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
rc = ext3_journal_dirty_metadata(handle, bh); rc = ext3_journal_dirty_metadata(handle, bh);
if (!err) if (!err)
@@ -2849,7 +2857,8 @@ ext3_reserve_inode_write(handle_t *handl @@ -2839,7 +2847,8 @@ ext3_reserve_inode_write(handle_t *handl
{ {
int err = 0; int err = 0;
if (handle) { if (handle) {
...@@ -58,11 +58,11 @@ Index: linux-2.6.0/fs/ext3/inode.c ...@@ -58,11 +58,11 @@ Index: linux-2.6.0/fs/ext3/inode.c
if (!err) { if (!err) {
BUFFER_TRACE(iloc->bh, "get_write_access"); BUFFER_TRACE(iloc->bh, "get_write_access");
err = ext3_journal_get_write_access(handle, iloc->bh); err = ext3_journal_get_write_access(handle, iloc->bh);
Index: linux-2.6.0/fs/ext3/xattr.c Index: linux-2.6.5-7.311/fs/ext3/xattr.c
=================================================================== ===================================================================
--- linux-2.6.0.orig/fs/ext3/xattr.c 2003-12-30 08:33:13.000000000 +0300 --- linux-2.6.5-7.311.orig/fs/ext3/xattr.c
+++ linux-2.6.0/fs/ext3/xattr.c 2004-01-14 18:54:12.000000000 +0300 +++ linux-2.6.5-7.311/fs/ext3/xattr.c
@@ -246,17 +246,12 @@ @@ -245,17 +245,12 @@ ext3_removexattr(struct dentry *dentry,
} }
/* /*
...@@ -83,7 +83,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -83,7 +83,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
void *buffer, size_t buffer_size) void *buffer, size_t buffer_size)
{ {
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
@@ -270,7 +265,6 @@ @@ -269,7 +264,6 @@ ext3_xattr_get(struct inode *inode, int
if (name == NULL) if (name == NULL)
return -EINVAL; return -EINVAL;
...@@ -91,7 +91,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -91,7 +91,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
error = -ENODATA; error = -ENODATA;
if (!EXT3_I(inode)->i_file_acl) if (!EXT3_I(inode)->i_file_acl)
goto cleanup; goto cleanup;
@@ -343,15 +337,87 @@ @@ -342,15 +336,87 @@ found:
cleanup: cleanup:
brelse(bh); brelse(bh);
...@@ -182,7 +182,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -182,7 +182,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
* provided, or compute the buffer size required. * provided, or compute the buffer size required.
* Buffer is NULL to compute the size of the buffer required. * Buffer is NULL to compute the size of the buffer required.
* *
@@ -359,7 +425,31 @@ @@ -358,7 +424,31 @@ cleanup:
* used / required on success. * used / required on success.
*/ */
int int
...@@ -215,7 +215,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -215,7 +215,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
{ {
struct buffer_head *bh = NULL; struct buffer_head *bh = NULL;
struct ext3_xattr_entry *entry; struct ext3_xattr_entry *entry;
@@ -370,7 +460,6 @@ @@ -369,7 +459,6 @@ ext3_xattr_list(struct inode *inode, cha
ea_idebug(inode, "buffer=%p, buffer_size=%ld", ea_idebug(inode, "buffer=%p, buffer_size=%ld",
buffer, (long)buffer_size); buffer, (long)buffer_size);
...@@ -223,7 +223,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -223,7 +223,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
error = 0; error = 0;
if (!EXT3_I(inode)->i_file_acl) if (!EXT3_I(inode)->i_file_acl)
goto cleanup; goto cleanup;
@@ -431,11 +520,138 @@ @@ -430,11 +519,138 @@ bad_block: ext3_error(inode->i_sb, "ext3
cleanup: cleanup:
brelse(bh); brelse(bh);
...@@ -363,7 +363,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -363,7 +363,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
/* /*
* If the EXT3_FEATURE_COMPAT_EXT_ATTR feature of this file system is * If the EXT3_FEATURE_COMPAT_EXT_ATTR feature of this file system is
* not set, set it. * not set, set it.
@@ -457,6 +673,279 @@ @@ -456,6 +672,279 @@ static void ext3_xattr_update_super_bloc
} }
/* /*
...@@ -643,7 +643,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -643,7 +643,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
* ext3_xattr_set_handle() * ext3_xattr_set_handle()
* *
* Create, replace or remove an extended attribute for this inode. Buffer * Create, replace or remove an extended attribute for this inode. Buffer
@@ -470,6 +959,104 @@ @@ -469,6 +958,110 @@ static void ext3_xattr_update_super_bloc
*/ */
int int
ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
...@@ -700,6 +700,9 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -700,6 +700,9 @@ Index: linux-2.6.0/fs/ext3/xattr.c
+ } else if (!found && (flags & XATTR_REPLACE)) { + } else if (!found && (flags & XATTR_REPLACE)) {
+ err = -ENODATA; + err = -ENODATA;
+ goto finish; + goto finish;
+ } else if (!found && !value) {
+ err = 0;
+ goto finish;
+ } + }
+ +
+ /* check if we have enough space to store attribute */ + /* check if we have enough space to store attribute */
...@@ -723,14 +726,17 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -723,14 +726,17 @@ Index: linux-2.6.0/fs/ext3/xattr.c
+ } + }
+ } + }
+ +
+ /* try to store EA in inode body */ + /* Add entry if value is provided */
+ err = ext3_xattr_ibody_set(handle, inode, name_index, name, + if (value != NULL) {
+ value, value_len, flags); + /* try to store EA in inode body */
+ if (err) { + err = ext3_xattr_ibody_set(handle, inode, name_index, name,
+ /* can't store EA in inode body */ + value, value_len, flags);
+ /* try to store in block */ + if (err) {
+ err = ext3_xattr_block_set(handle, inode, name_index, + /* can't store EA in inode body */
+ name, value, value_len, flags); + /* try to store in block */
+ err = ext3_xattr_block_set(handle, inode, name_index,
+ name, value, value_len, flags);
+ }
+ } + }
+ +
+finish: +finish:
...@@ -748,7 +754,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -748,7 +754,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
const char *name, const void *value, size_t value_len, const char *name, const void *value, size_t value_len,
int flags) int flags)
{ {
@@ -492,22 +1078,7 @@ @@ -491,22 +1084,7 @@ ext3_xattr_set_handle(handle_t *handle,
* towards the end of the block). * towards the end of the block).
* end -- Points right after the block pointed to by header. * end -- Points right after the block pointed to by header.
*/ */
...@@ -771,7 +777,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -771,7 +777,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
if (EXT3_I(inode)->i_file_acl) { if (EXT3_I(inode)->i_file_acl) {
/* The inode already has an extended attribute block. */ /* The inode already has an extended attribute block. */
bh = sb_bread(sb, EXT3_I(inode)->i_file_acl); bh = sb_bread(sb, EXT3_I(inode)->i_file_acl);
@@ -733,7 +1304,6 @@ @@ -730,7 +1308,6 @@ cleanup:
brelse(bh); brelse(bh);
if (!(bh && header == HDR(bh))) if (!(bh && header == HDR(bh)))
kfree(header); kfree(header);
...@@ -779,11 +785,11 @@ Index: linux-2.6.0/fs/ext3/xattr.c ...@@ -779,11 +785,11 @@ Index: linux-2.6.0/fs/ext3/xattr.c
return error; return error;
} }
Index: linux-2.6.0/fs/ext3/xattr.h Index: linux-2.6.5-7.311/fs/ext3/xattr.h
=================================================================== ===================================================================
--- linux-2.6.0.orig/fs/ext3/xattr.h 2003-06-24 18:04:43.000000000 +0400 --- linux-2.6.5-7.311.orig/fs/ext3/xattr.h
+++ linux-2.6.0/fs/ext3/xattr.h 2004-01-14 18:54:12.000000000 +0300 +++ linux-2.6.5-7.311/fs/ext3/xattr.h
@@ -77,7 +77,8 @@ @@ -77,7 +77,8 @@ extern int ext3_removexattr(struct dentr
extern int ext3_xattr_get(struct inode *, int, const char *, void *, size_t); extern int ext3_xattr_get(struct inode *, int, const char *, void *, size_t);
extern int ext3_xattr_list(struct inode *, char *, size_t); extern int ext3_xattr_list(struct inode *, char *, size_t);
extern int ext3_xattr_set(struct inode *, int, const char *, const void *, size_t, int); extern int ext3_xattr_set(struct inode *, int, const char *, const void *, size_t, int);
...@@ -793,11 +799,11 @@ Index: linux-2.6.0/fs/ext3/xattr.h ...@@ -793,11 +799,11 @@ Index: linux-2.6.0/fs/ext3/xattr.h
extern void ext3_xattr_delete_inode(handle_t *, struct inode *); extern void ext3_xattr_delete_inode(handle_t *, struct inode *);
extern void ext3_xattr_put_super(struct super_block *); extern void ext3_xattr_put_super(struct super_block *);
Index: linux-2.6.0/include/linux/ext3_fs.h Index: linux-2.6.5-7.311/include/linux/ext3_fs.h
=================================================================== ===================================================================
--- linux-2.6.0.orig/include/linux/ext3_fs.h 2004-01-14 18:54:11.000000000 +0300 --- linux-2.6.5-7.311.orig/include/linux/ext3_fs.h
+++ linux-2.6.0/include/linux/ext3_fs.h 2004-01-14 18:54:12.000000000 +0300 +++ linux-2.6.5-7.311/include/linux/ext3_fs.h
@@ -265,6 +265,8 @@ @@ -267,6 +267,8 @@ struct ext3_inode {
__u32 m_i_reserved2[2]; __u32 m_i_reserved2[2];
} masix2; } masix2;
} osd2; /* OS dependent 2 */ } osd2; /* OS dependent 2 */
...@@ -806,7 +812,7 @@ Index: linux-2.6.0/include/linux/ext3_fs.h ...@@ -806,7 +812,7 @@ Index: linux-2.6.0/include/linux/ext3_fs.h
}; };
#define i_size_high i_dir_acl #define i_size_high i_dir_acl
@@ -721,6 +723,7 @@ @@ -729,6 +731,7 @@ extern unsigned long ext3_count_free (st
extern int ext3_forget(handle_t *, int, struct inode *, struct buffer_head *, int); extern int ext3_forget(handle_t *, int, struct inode *, struct buffer_head *, int);
extern struct buffer_head * ext3_getblk (handle_t *, struct inode *, long, int, int *); extern struct buffer_head * ext3_getblk (handle_t *, struct inode *, long, int, int *);
extern struct buffer_head * ext3_bread (handle_t *, struct inode *, int, int, int *); extern struct buffer_head * ext3_bread (handle_t *, struct inode *, int, int, int *);
...@@ -814,11 +820,11 @@ Index: linux-2.6.0/include/linux/ext3_fs.h ...@@ -814,11 +820,11 @@ Index: linux-2.6.0/include/linux/ext3_fs.h
extern void ext3_read_inode (struct inode *); extern void ext3_read_inode (struct inode *);
extern void ext3_write_inode (struct inode *, int); extern void ext3_write_inode (struct inode *, int);
Index: linux-2.6.0/include/linux/ext3_fs_i.h Index: linux-2.6.5-7.311/include/linux/ext3_fs_i.h
=================================================================== ===================================================================
--- linux-2.6.0.orig/include/linux/ext3_fs_i.h 2003-12-30 08:32:44.000000000 +0300 --- linux-2.6.5-7.311.orig/include/linux/ext3_fs_i.h
+++ linux-2.6.0/include/linux/ext3_fs_i.h 2004-01-14 18:54:12.000000000 +0300 +++ linux-2.6.5-7.311/include/linux/ext3_fs_i.h
@@ -96,6 +96,9 @@ @@ -113,6 +113,9 @@ struct ext3_inode_info {
*/ */
loff_t i_disksize; loff_t i_disksize;
...@@ -828,13 +834,3 @@ Index: linux-2.6.0/include/linux/ext3_fs_i.h ...@@ -828,13 +834,3 @@ Index: linux-2.6.0/include/linux/ext3_fs_i.h
/* /*
* truncate_sem is for serialising ext3_truncate() against * truncate_sem is for serialising ext3_truncate() against
* ext3_getblock(). In the 2.4 ext2 design, great chunks of inode's * ext3_getblock(). In the 2.4 ext2 design, great chunks of inode's
%diffstat
fs/ext3/ialloc.c | 5
fs/ext3/inode.c | 10
fs/ext3/xattr.c | 634 +++++++++++++++++++++++++++++++++++++++++++---
fs/ext3/xattr.h | 3
include/linux/ext3_fs.h | 2
include/linux/ext3_fs_i.h | 3
6 files changed, 623 insertions(+), 34 deletions(-)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy