| Message ID | 1266432380-9951-1-git-send-email-dmonakhov@openvz.org |
|---|---|
| State | Accepted |
| Commit | abf5d08acaca942b49daf0ed87a9deddc94b183a |
| Headers | show |
On Wed, 2010-02-17 at 21:46 +0300, Dmitry Monakhov wrote: > Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> Acked-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> > --- > fs/ubifs/dir.c | 9 +-------- > 1 files changed, 1 insertions(+), 8 deletions(-) > > diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c > index 552fb01..5a357bf 100644 > --- a/fs/ubifs/dir.c > +++ b/fs/ubifs/dir.c > @@ -104,14 +104,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, > */ > inode->i_flags |= (S_NOCMTIME); > > - inode->i_uid = current_fsuid(); > - if (dir->i_mode & S_ISGID) { > - inode->i_gid = dir->i_gid; > - if (S_ISDIR(mode)) > - mode |= S_ISGID; > - } else > - inode->i_gid = current_fsgid(); > - inode->i_mode = mode; > + inode_init_owner(inode, dir, mode); > inode->i_mtime = inode->i_atime = inode->i_ctime = > ubifs_current_time(inode); > inode->i_mapping->nrpages = 0;
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 552fb01..5a357bf 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -104,14 +104,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, */ inode->i_flags |= (S_NOCMTIME); - inode->i_uid = current_fsuid(); - if (dir->i_mode & S_ISGID) { - inode->i_gid = dir->i_gid; - if (S_ISDIR(mode)) - mode |= S_ISGID; - } else - inode->i_gid = current_fsgid(); - inode->i_mode = mode; + inode_init_owner(inode, dir, mode); inode->i_mtime = inode->i_atime = inode->i_ctime = ubifs_current_time(inode); inode->i_mapping->nrpages = 0;
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> --- fs/ubifs/dir.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-)