adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

reiserfs: deal with NULL xattr root w/ xattrs disabled

Browse source 
This avoids an Oops in open_xa_root that can occur when deleting a file
with xattrs disabled.  It assumes that the xattr root will be there, and
that is not guaranteed.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Mahoney 2009-05-17 01:02:02 -04:00 committed by Linus Torvalds
parent 12abb35a03
commit ceb5edc457
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/reiserfs/super.c
View file

@ -448,13 +448,11 @@ int remove_save_link(struct inode *inode, int truncate)
static void reiserfs_kill_sb(struct super_block *s) static void reiserfs_kill_sb(struct super_block *s)
{ {
if (REISERFS_SB(s)) { if (REISERFS_SB(s)) {
#ifdef CONFIG_REISERFS_FS_XATTR
if (REISERFS_SB(s)->xattr_root) { if (REISERFS_SB(s)->xattr_root) {
d_invalidate(REISERFS_SB(s)->xattr_root); d_invalidate(REISERFS_SB(s)->xattr_root);
dput(REISERFS_SB(s)->xattr_root); dput(REISERFS_SB(s)->xattr_root);
REISERFS_SB(s)->xattr_root = NULL; REISERFS_SB(s)->xattr_root = NULL;
} }
#endif
if (REISERFS_SB(s)->priv_root) { if (REISERFS_SB(s)->priv_root) {
d_invalidate(REISERFS_SB(s)->priv_root); d_invalidate(REISERFS_SB(s)->priv_root);
dput(REISERFS_SB(s)->priv_root); dput(REISERFS_SB(s)->priv_root);

4
fs/reiserfs/xattr.c
View file

@ -123,7 +123,9 @@ static struct dentry *open_xa_root(struct super_block *sb, int flags)
mutex_lock_nested(&privroot->d_inode->i_mutex, I_MUTEX_XATTR); mutex_lock_nested(&privroot->d_inode->i_mutex, I_MUTEX_XATTR);
xaroot = dget(REISERFS_SB(sb)->xattr_root); xaroot = dget(REISERFS_SB(sb)->xattr_root);
if (!xaroot->d_inode) { if (!xaroot)
xaroot = ERR_PTR(-ENODATA);
else if (!xaroot->d_inode) {
int err = -ENODATA; int err = -ENODATA;
if (xattr_may_create(flags)) if (xattr_may_create(flags))
err = xattr_mkdir(privroot->d_inode, xaroot, 0700); err = xattr_mkdir(privroot->d_inode, xaroot, 0700);