Messages in this thread |  | | | Subject | Re: sysfs_chmod_file() broken in 2.6.33-rc4-git6 | | From | (Eric W. Biederman) | | Date | Wed, 03 Feb 2010 23:05:50 -0800 |
| |
Greg KH <gregkh@suse.de> writes:
> On Wed, Feb 03, 2010 at 09:11:38AM +0100, Jean Delvare wrote: >> On Thu, 21 Jan 2010 20:19:13 -0800, Greg KH wrote: >> > On Wed, Jan 20, 2010 at 04:00:08PM +0100, Jean Delvare wrote: >> > > On Wed, 20 Jan 2010 06:01:02 -0800, Eric W. Biederman wrote: >> > > > Does this fix your issue? >> > > > >> > > > Eric >> > > > >> > > > >> > > > diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c >> > > > index 220b758..6a06a1d 100644 >> > > > --- a/fs/sysfs/inode.c >> > > > +++ b/fs/sysfs/inode.c >> > > > @@ -81,24 +81,23 @@ int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr * iattr) >> > > > if (!sd_attrs) >> > > > return -ENOMEM; >> > > > sd->s_iattr = sd_attrs; >> > > > - } else { >> > > > - /* attributes were changed at least once in past */ >> > > > - iattrs = &sd_attrs->ia_iattr; >> > > > - >> > > > - if (ia_valid & ATTR_UID) >> > > > - iattrs->ia_uid = iattr->ia_uid; >> > > > - if (ia_valid & ATTR_GID) >> > > > - iattrs->ia_gid = iattr->ia_gid; >> > > > - if (ia_valid & ATTR_ATIME) >> > > > - iattrs->ia_atime = iattr->ia_atime; >> > > > - if (ia_valid & ATTR_MTIME) >> > > > - iattrs->ia_mtime = iattr->ia_mtime; >> > > > - if (ia_valid & ATTR_CTIME) >> > > > - iattrs->ia_ctime = iattr->ia_ctime; >> > > > - if (ia_valid & ATTR_MODE) { >> > > > - umode_t mode = iattr->ia_mode; >> > > > - iattrs->ia_mode = sd->s_mode = mode; >> > > > - } >> > > > + } >> > > > + /* attributes were changed at least once in past */ >> > > > + iattrs = &sd_attrs->ia_iattr; >> > > > + >> > > > + if (ia_valid & ATTR_UID) >> > > > + iattrs->ia_uid = iattr->ia_uid; >> > > > + if (ia_valid & ATTR_GID) >> > > > + iattrs->ia_gid = iattr->ia_gid; >> > > > + if (ia_valid & ATTR_ATIME) >> > > > + iattrs->ia_atime = iattr->ia_atime; >> > > > + if (ia_valid & ATTR_MTIME) >> > > > + iattrs->ia_mtime = iattr->ia_mtime; >> > > > + if (ia_valid & ATTR_CTIME) >> > > > + iattrs->ia_ctime = iattr->ia_ctime; >> > > > + if (ia_valid & ATTR_MODE) { >> > > > + umode_t mode = iattr->ia_mode; >> > > > + iattrs->ia_mode = sd->s_mode = mode; >> > > > } >> > > > return 0; >> > > > } >> > > >> > > Yes, this fixes my problem. Thanks for the fast fix! >> > >> > Great, Eric, care to resend this so that I can submit it for inclusion? >> >> Ping Eric, the patch is still not in Linus' tree. > > Nor mine :) > > Eric, care to send it to me?
Apologies for the long delay. I have been extremely out of it lately. I am should have a signed off by version sent shortly. I looked and this problem also exists in 2.6.32 but hides because in that case we directly update the vfs inode so sysfs_chmod works until the vfs inode is evicted. I will send you a patch for 2.6.32 -stable as well.
Eric
|  |