From 7e7e9d14a3532f7184582060d6a7b9f6c4a296d3 Mon Sep 17 00:00:00 2001
From: kalpak <kalpak>
Date: Tue, 15 Jul 2008 13:07:36 +0000
Subject: [PATCH] b=16198 i=adilger i=girish
correct inoptimal removal of xattrs in RHEL4/SLES9 code
---
.../patches/ext3-ea-in-inode-2.6-rhel4.patch | 96 ++++++++--------
.../patches/ext3-ea-in-inode-2.6-suse.patch | 108 +++++++++---------
2 files changed, 103 insertions(+), 101 deletions(-)
diff --git a/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-rhel4.patch
index 89cc1b5d4b..bf3ba6c406 100644
--- a/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-rhel4.patch
@@ -1,8 +1,8 @@
-Index: linux-stage/fs/ext3/ialloc.c
+Index: linux-2.6.9-67.0.20/fs/ext3/ialloc.c
===================================================================
---- linux-stage.orig/fs/ext3/ialloc.c 2005-10-04 16:53:24.000000000 -0600
-+++ linux-stage/fs/ext3/ialloc.c 2005-10-04 17:07:25.000000000 -0600
-@@ -629,6 +629,9 @@
+--- linux-2.6.9-67.0.20.orig/fs/ext3/ialloc.c
++++ linux-2.6.9-67.0.20/fs/ext3/ialloc.c
+@@ -632,6 +632,9 @@ got:
spin_unlock(&sbi->s_next_gen_lock);
ei->i_state = EXT3_STATE_NEW;
@@ -12,11 +12,11 @@ Index: linux-stage/fs/ext3/ialloc.c
ret = inode;
if(DQUOT_ALLOC_INODE(inode)) {
-Index: linux-stage/fs/ext3/inode.c
+Index: linux-2.6.9-67.0.20/fs/ext3/inode.c
===================================================================
---- linux-stage.orig/fs/ext3/inode.c 2005-10-04 17:00:22.000000000 -0600
-+++ linux-stage/fs/ext3/inode.c 2005-10-04 17:07:25.000000000 -0600
-@@ -2274,7 +2274,7 @@
+--- linux-2.6.9-67.0.20.orig/fs/ext3/inode.c
++++ linux-2.6.9-67.0.20/fs/ext3/inode.c
+@@ -2275,7 +2275,7 @@ static unsigned long ext3_get_inode_bloc
* trying to determine the inode's location on-disk and no read need be
* performed.
*/
@@ -25,7 +25,7 @@ Index: linux-stage/fs/ext3/inode.c
struct ext3_iloc *iloc, int in_mem)
{
unsigned long block;
-@@ -2484,6 +2484,11 @@ void ext3_read_inode(struct inode * inod
+@@ -2485,6 +2485,11 @@ void ext3_read_inode(struct inode * inod
ei->i_data[block] = raw_inode->i_block[block];
INIT_LIST_HEAD(&ei->i_orphan);
@@ -37,7 +37,7 @@ Index: linux-stage/fs/ext3/inode.c
if (S_ISREG(inode->i_mode)) {
inode->i_op = &ext3_file_inode_operations;
inode->i_fop = &ext3_file_operations;
-@@ -2619,6 +2624,9 @@ static int ext3_do_update_inode(handle_t
+@@ -2620,6 +2625,9 @@ static int ext3_do_update_inode(handle_t
} else for (block = 0; block < EXT3_N_BLOCKS; block++)
raw_inode->i_block[block] = ei->i_data[block];
@@ -47,7 +47,7 @@ Index: linux-stage/fs/ext3/inode.c
BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
rc = ext3_journal_dirty_metadata(handle, bh);
if (!err)
-@@ -2849,7 +2857,8 @@ ext3_reserve_inode_write(handle_t *handl
+@@ -2850,7 +2858,8 @@ ext3_reserve_inode_write(handle_t *handl
{
int err = 0;
if (handle) {
@@ -57,11 +57,11 @@ Index: linux-stage/fs/ext3/inode.c
if (!err) {
BUFFER_TRACE(iloc->bh, "get_write_access");
err = ext3_journal_get_write_access(handle, iloc->bh);
-Index: linux-stage/fs/ext3/xattr.c
+Index: linux-2.6.9-67.0.20/fs/ext3/xattr.c
===================================================================
---- linux-stage.orig/fs/ext3/xattr.c 2005-10-04 16:50:11.000000000 -0600
-+++ linux-stage/fs/ext3/xattr.c 2005-10-04 17:19:43.000000000 -0600
-@@ -149,17 +149,12 @@
+--- linux-2.6.9-67.0.20.orig/fs/ext3/xattr.c
++++ linux-2.6.9-67.0.20/fs/ext3/xattr.c
+@@ -149,17 +149,12 @@ ext3_listxattr(struct dentry *dentry, ch
}
/*
@@ -82,7 +82,7 @@ Index: linux-stage/fs/ext3/xattr.c
void *buffer, size_t buffer_size)
{
struct buffer_head *bh = NULL;
-@@ -173,7 +168,6 @@
+@@ -173,7 +168,6 @@ ext3_xattr_get(struct inode *inode, int
if (name == NULL)
return -EINVAL;
@@ -90,7 +90,7 @@ Index: linux-stage/fs/ext3/xattr.c
error = -ENODATA;
if (!EXT3_I(inode)->i_file_acl)
goto cleanup;
-@@ -246,15 +240,87 @@
+@@ -246,15 +240,87 @@ found:
cleanup:
brelse(bh);
@@ -181,7 +181,7 @@ Index: linux-stage/fs/ext3/xattr.c
* provided, or compute the buffer size required.
* Buffer is NULL to compute the size of the buffer required.
*
-@@ -262,7 +328,31 @@
+@@ -262,7 +328,31 @@ cleanup:
* used / required on success.
*/
int
@@ -214,7 +214,7 @@ Index: linux-stage/fs/ext3/xattr.c
{
struct buffer_head *bh = NULL;
struct ext3_xattr_entry *entry;
-@@ -273,7 +363,6 @@
+@@ -273,7 +363,6 @@ ext3_xattr_list(struct inode *inode, cha
ea_idebug(inode, "buffer=%p, buffer_size=%ld",
buffer, (long)buffer_size);
@@ -222,7 +222,7 @@ Index: linux-stage/fs/ext3/xattr.c
error = 0;
if (!EXT3_I(inode)->i_file_acl)
goto cleanup;
-@@ -330,11 +419,149 @@
+@@ -330,11 +419,149 @@ bad_block: ext3_error(inode->i_sb, "ext3
cleanup:
brelse(bh);
@@ -373,7 +373,7 @@ Index: linux-stage/fs/ext3/xattr.c
/*
* If the EXT3_FEATURE_COMPAT_EXT_ATTR feature of this file system is
* not set, set it.
-@@ -356,6 +583,279 @@
+@@ -356,6 +583,279 @@ static void ext3_xattr_update_super_bloc
}
/*
@@ -653,7 +653,7 @@ Index: linux-stage/fs/ext3/xattr.c
* ext3_xattr_set_handle()
*
* Create, replace or remove an extended attribute for this inode. Buffer
-@@ -369,6 +869,104 @@
+@@ -369,6 +869,110 @@ static void ext3_xattr_update_super_bloc
*/
int
ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
@@ -710,6 +710,9 @@ Index: linux-stage/fs/ext3/xattr.c
+ } else if (!found && (flags & XATTR_REPLACE)) {
+ err = -ENODATA;
+ goto finish;
++ } else if (!found && !value) {
++ err = 0;
++ goto finish;
+ }
+
+ /* check if we have enough space to store attribute */
@@ -733,14 +736,17 @@ Index: linux-stage/fs/ext3/xattr.c
+ }
+ }
+
-+ /* try to store EA in inode body */
-+ err = ext3_xattr_ibody_set(handle, inode, name_index, name,
-+ value, value_len, flags);
-+ if (err) {
-+ /* can't store EA in inode body */
-+ /* try to store in block */
-+ err = ext3_xattr_block_set(handle, inode, name_index,
-+ name, value, value_len, flags);
++ /* Add entry if value is provided */
++ if (value != NULL) {
++ /* try to store EA in inode body */
++ err = ext3_xattr_ibody_set(handle, inode, name_index, name,
++ value, value_len, flags);
++ if (err) {
++ /* can't store EA in inode body */
++ /* try to store in block */
++ err = ext3_xattr_block_set(handle, inode, name_index,
++ name, value, value_len, flags);
++ }
+ }
+
+finish:
@@ -758,7 +764,7 @@ Index: linux-stage/fs/ext3/xattr.c
const char *name, const void *value, size_t value_len,
int flags)
{
-@@ -391,22 +989,7 @@
+@@ -391,22 +995,7 @@ ext3_xattr_set_handle(handle_t *handle,
* towards the end of the block).
* end -- Points right after the block pointed to by header.
*/
@@ -781,7 +787,7 @@ Index: linux-stage/fs/ext3/xattr.c
if (EXT3_I(inode)->i_file_acl) {
/* The inode already has an extended attribute block. */
bh = sb_bread(sb, EXT3_I(inode)->i_file_acl);
-@@ -638,7 +1221,6 @@
+@@ -638,7 +1227,6 @@ cleanup:
brelse(bh);
if (!(bh && header == HDR(bh)))
kfree(header);
@@ -789,11 +795,11 @@ Index: linux-stage/fs/ext3/xattr.c
return error;
}
-Index: linux-stage/fs/ext3/xattr.h
+Index: linux-2.6.9-67.0.20/fs/ext3/xattr.h
===================================================================
---- linux-stage.orig/fs/ext3/xattr.h 2005-10-04 16:50:11.000000000 -0600
-+++ linux-stage/fs/ext3/xattr.h 2005-10-04 17:07:25.000000000 -0600
-@@ -67,7 +67,8 @@
+--- linux-2.6.9-67.0.20.orig/fs/ext3/xattr.h
++++ linux-2.6.9-67.0.20/fs/ext3/xattr.h
+@@ -67,7 +67,8 @@ extern ssize_t ext3_listxattr(struct den
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_set(struct inode *, int, const char *, const void *, size_t, int);
@@ -803,11 +809,11 @@ Index: linux-stage/fs/ext3/xattr.h
extern void ext3_xattr_delete_inode(handle_t *, struct inode *);
extern void ext3_xattr_put_super(struct super_block *);
-Index: linux-stage/include/linux/ext3_fs.h
+Index: linux-2.6.9-67.0.20/include/linux/ext3_fs.h
===================================================================
---- linux-stage.orig/include/linux/ext3_fs.h 2005-10-04 16:53:29.000000000 -0600
-+++ linux-stage/include/linux/ext3_fs.h 2005-10-04 17:07:25.000000000 -0600
-@@ -293,6 +293,8 @@
+--- linux-2.6.9-67.0.20.orig/include/linux/ext3_fs.h
++++ linux-2.6.9-67.0.20/include/linux/ext3_fs.h
+@@ -293,6 +293,8 @@ struct ext3_inode {
__u32 m_i_reserved2[2];
} masix2;
} osd2; /* OS dependent 2 */
@@ -816,7 +822,7 @@ Index: linux-stage/include/linux/ext3_fs.h
};
#define i_size_high i_dir_acl
-@@ -757,6 +759,7 @@
+@@ -757,6 +759,7 @@ extern unsigned long ext3_count_free (st
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_bread (handle_t *, struct inode *, int, int, int *);
@@ -824,11 +830,11 @@ Index: linux-stage/include/linux/ext3_fs.h
extern void ext3_read_inode (struct inode *);
extern int ext3_write_inode (struct inode *, int);
-Index: linux-stage/include/linux/ext3_fs_i.h
+Index: linux-2.6.9-67.0.20/include/linux/ext3_fs_i.h
===================================================================
---- linux-stage.orig/include/linux/ext3_fs_i.h 2005-10-04 16:50:11.000000000 -0600
-+++ linux-stage/include/linux/ext3_fs_i.h 2005-10-04 17:07:25.000000000 -0600
-@@ -113,6 +113,9 @@
+--- linux-2.6.9-67.0.20.orig/include/linux/ext3_fs_i.h
++++ linux-2.6.9-67.0.20/include/linux/ext3_fs_i.h
+@@ -113,6 +113,9 @@ struct ext3_inode_info {
*/
loff_t i_disksize;
diff --git a/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch b/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch
index 72c25a4def..18efe81e0d 100644
--- a/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch
@@ -1,10 +1,10 @@
%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.0/fs/ext3/ialloc.c 2004-01-14 18:54:12.000000000 +0300
-@@ -627,6 +627,9 @@
- inode->i_generation = EXT3_SB(sb)->s_next_generation++;
+--- linux-2.6.5-7.311.orig/fs/ext3/ialloc.c
++++ linux-2.6.5-7.311/fs/ext3/ialloc.c
+@@ -633,6 +633,9 @@ got:
+ spin_unlock(&sbi->s_next_gen_lock);
ei->i_state = EXT3_STATE_NEW;
+ ei->i_extra_isize =
@@ -13,11 +13,11 @@ Index: linux-2.6.0/fs/ext3/ialloc.c
ret = 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.0/fs/ext3/inode.c 2004-01-14 19:09:46.000000000 +0300
-@@ -2339,7 +2339,7 @@
+--- linux-2.6.5-7.311.orig/fs/ext3/inode.c
++++ linux-2.6.5-7.311/fs/ext3/inode.c
+@@ -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
* performed.
*/
@@ -26,7 +26,7 @@ Index: linux-2.6.0/fs/ext3/inode.c
struct ext3_iloc *iloc, int in_mem)
{
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];
INIT_LIST_HEAD(&ei->i_orphan);
@@ -38,7 +38,7 @@ Index: linux-2.6.0/fs/ext3/inode.c
if (S_ISREG(inode->i_mode)) {
inode->i_op = &ext3_file_inode_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++)
raw_inode->i_block[block] = ei->i_data[block];
@@ -48,7 +48,7 @@ Index: linux-2.6.0/fs/ext3/inode.c
BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
rc = ext3_journal_dirty_metadata(handle, bh);
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;
if (handle) {
@@ -58,11 +58,11 @@ Index: linux-2.6.0/fs/ext3/inode.c
if (!err) {
BUFFER_TRACE(iloc->bh, "get_write_access");
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.0/fs/ext3/xattr.c 2004-01-14 18:54:12.000000000 +0300
-@@ -246,17 +246,12 @@
+--- linux-2.6.5-7.311.orig/fs/ext3/xattr.c
++++ linux-2.6.5-7.311/fs/ext3/xattr.c
+@@ -245,17 +245,12 @@ ext3_removexattr(struct dentry *dentry,
}
/*
@@ -83,7 +83,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
void *buffer, size_t buffer_size)
{
struct buffer_head *bh = NULL;
-@@ -270,7 +265,6 @@
+@@ -269,7 +264,6 @@ ext3_xattr_get(struct inode *inode, int
if (name == NULL)
return -EINVAL;
@@ -91,7 +91,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
error = -ENODATA;
if (!EXT3_I(inode)->i_file_acl)
goto cleanup;
-@@ -343,15 +337,87 @@
+@@ -342,15 +336,87 @@ found:
cleanup:
brelse(bh);
@@ -182,7 +182,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
* provided, or compute the buffer size 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.
*/
int
@@ -215,7 +215,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
{
struct buffer_head *bh = NULL;
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",
buffer, (long)buffer_size);
@@ -223,7 +223,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
error = 0;
if (!EXT3_I(inode)->i_file_acl)
goto cleanup;
-@@ -431,11 +520,138 @@
+@@ -430,11 +519,138 @@ bad_block: ext3_error(inode->i_sb, "ext3
cleanup:
brelse(bh);
@@ -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
* 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
* ext3_xattr_set_handle()
*
* 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
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
+ } else if (!found && (flags & XATTR_REPLACE)) {
+ err = -ENODATA;
+ goto finish;
++ } else if (!found && !value) {
++ err = 0;
++ goto finish;
+ }
+
+ /* check if we have enough space to store attribute */
@@ -723,14 +726,17 @@ Index: linux-2.6.0/fs/ext3/xattr.c
+ }
+ }
+
-+ /* try to store EA in inode body */
-+ err = ext3_xattr_ibody_set(handle, inode, name_index, name,
-+ value, value_len, flags);
-+ if (err) {
-+ /* can't store EA in inode body */
-+ /* try to store in block */
-+ err = ext3_xattr_block_set(handle, inode, name_index,
-+ name, value, value_len, flags);
++ /* Add entry if value is provided */
++ if (value != NULL) {
++ /* try to store EA in inode body */
++ err = ext3_xattr_ibody_set(handle, inode, name_index, name,
++ value, value_len, flags);
++ if (err) {
++ /* can't store EA in inode body */
++ /* try to store in block */
++ err = ext3_xattr_block_set(handle, inode, name_index,
++ name, value, value_len, flags);
++ }
+ }
+
+finish:
@@ -748,7 +754,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
const char *name, const void *value, size_t value_len,
int flags)
{
-@@ -492,22 +1078,7 @@
+@@ -491,22 +1084,7 @@ ext3_xattr_set_handle(handle_t *handle,
* towards the end of the block).
* end -- Points right after the block pointed to by header.
*/
@@ -771,7 +777,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
if (EXT3_I(inode)->i_file_acl) {
/* The inode already has an extended attribute block. */
bh = sb_bread(sb, EXT3_I(inode)->i_file_acl);
-@@ -733,7 +1304,6 @@
+@@ -730,7 +1308,6 @@ cleanup:
brelse(bh);
if (!(bh && header == HDR(bh)))
kfree(header);
@@ -779,11 +785,11 @@ Index: linux-2.6.0/fs/ext3/xattr.c
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.0/fs/ext3/xattr.h 2004-01-14 18:54:12.000000000 +0300
-@@ -77,7 +77,8 @@
+--- linux-2.6.5-7.311.orig/fs/ext3/xattr.h
++++ linux-2.6.5-7.311/fs/ext3/xattr.h
+@@ -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_list(struct inode *, char *, size_t);
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
extern void ext3_xattr_delete_inode(handle_t *, struct inode *);
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.0/include/linux/ext3_fs.h 2004-01-14 18:54:12.000000000 +0300
-@@ -265,6 +265,8 @@
+--- linux-2.6.5-7.311.orig/include/linux/ext3_fs.h
++++ linux-2.6.5-7.311/include/linux/ext3_fs.h
+@@ -267,6 +267,8 @@ struct ext3_inode {
__u32 m_i_reserved2[2];
} masix2;
} osd2; /* OS dependent 2 */
@@ -806,7 +812,7 @@ Index: linux-2.6.0/include/linux/ext3_fs.h
};
#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 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 *);
@@ -814,11 +820,11 @@ Index: linux-2.6.0/include/linux/ext3_fs.h
extern void ext3_read_inode (struct inode *);
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.0/include/linux/ext3_fs_i.h 2004-01-14 18:54:12.000000000 +0300
-@@ -96,6 +96,9 @@
+--- linux-2.6.5-7.311.orig/include/linux/ext3_fs_i.h
++++ linux-2.6.5-7.311/include/linux/ext3_fs_i.h
+@@ -113,6 +113,9 @@ struct ext3_inode_info {
*/
loff_t i_disksize;
@@ -828,13 +834,3 @@ Index: linux-2.6.0/include/linux/ext3_fs_i.h
/*
* truncate_sem is for serialising ext3_truncate() against
* 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(-)
-
--
GitLab