diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
| commit | a3bc068022b968a3042b48eb9a8e8b0418fb9cdd (patch) | |
| tree | 6bbc2806756924105802f4584157396fb98d282c /fs/reiserfs/inode.c | |
| parent | 54cfb5aa0f4859bd38706eabe0118175780a542f (diff) | |
| parent | 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/reiserfs/inode.c')
| -rw-r--r-- | fs/reiserfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index d9f614a5773..ff291c973a5 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -1985,7 +1985,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, * iput doesn't deadlock in reiserfs_delete_xattrs. The locking * code really needs to be reworked, but this will take care of it * for now. -jeffm */ - if (REISERFS_I(dir)->i_acl_default) { + if (REISERFS_I(dir)->i_acl_default && !IS_ERR(REISERFS_I(dir)->i_acl_default)) { reiserfs_write_unlock_xattrs(dir->i_sb); iput(inode); reiserfs_write_lock_xattrs(dir->i_sb); |