The patch titled
ext2: convert to use the new truncate convention fix
has been added to the -mm tree. Its filename is
ext2-convert-to-use-the-new-truncate-convention-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ext2: convert to use the new truncate convention fix
From: Nick Piggin <npiggin@xxxxxxx>
On Fri, Aug 21, 2009 at 04:06:59PM +0200, Jan Kara wrote:
> > Hi,
> >
> > > I also have commented a possible bug in existing ext2 code, marked with XXX.
> > Looks good, except:
> >
> > > +int ext2_setsize(struct inode *inode, loff_t newsize)
> > This could be static.
> >
> > > @@ -1459,8 +1540,15 @@ int ext2_setattr(struct dentry *dentry,
> > > if (error)
> > > return error;
> > > }
> > > - error = inode_setattr(inode, iattr);
> > > + if (iattr->ia_valid & ATTR_SIZE) {
> > > + error = ext2_setsize(inode, iattr->ia_size);
> > > + if (error)
> > > + return error;
> > > + }
> > > + generic_setattr(inode, iattr);
> > Here, we should store the error code I suppose...
> Ah, I was confused. generic_setattr() returns void. But then remove
> the check !error from:
> if (!error && (iattr->ia_valid & ATTR_MODE))
> which just follows the generic_setattr(). That's what made me think
> generic_setattr() returns something :)
Yep, good suggestion.
Cc: Jan Kara <jack@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ext2/inode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN fs/ext2/inode.c~ext2-convert-to-use-the-new-truncate-convention-fix fs/ext2/inode.c
--- a/fs/ext2/inode.c~ext2-convert-to-use-the-new-truncate-convention-fix
+++ a/fs/ext2/inode.c
@@ -1548,7 +1548,7 @@ int ext2_setattr(struct dentry *dentry,
return error;
}
generic_setattr(inode, iattr);
- if (!error && (iattr->ia_valid & ATTR_MODE))
+ if (iattr->ia_valid & ATTR_MODE)
error = ext2_acl_chmod(inode);
mark_inode_dirty(inode);
_
Patches currently in -mm which might be from npiggin@xxxxxxx are
linux-next.patch
fs-new-truncate-helpers.patch
fs-use-new-truncate-helpers.patch
fs-introduce-new-truncate-sequence.patch
fs-convert-simple-fs-to-new-truncate.patch
tmpfs-convert-to-use-the-new-truncate-convention.patch
ext2-convert-to-use-the-new-truncate-convention.patch
ext2-convert-to-use-the-new-truncate-convention-fix.patch
fat-convert-to-use-the-new-truncate-convention.patch
btrfs-convert-to-use-the-new-truncate-convention.patch
jfs-convert-to-use-the-new-truncate-convention.patch
udf-convert-to-use-the-new-truncate-convention.patch
minix-convert-to-use-the-new-truncate-convention.patch
ksm-no-debug-in-page_dup_rmap.patch
fs-turn-iprune_mutex-into-rwsem.patch
reiser4.patch
fs-symlink-write_begin-allocation-context-fix-reiser4-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
