diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-22 17:31:36 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-22 17:31:36 -0400 |
| commit | 729c80c6ffd7633210a09d4b55fdfab3c8d1866b (patch) | |
| tree | a8fe47dfa3da91b9902e61c55a811d3a66614fc8 /fs/reiserfs/inode.c | |
| parent | 4eaefb39528b3a78fb6a784162200b198d3e16ee (diff) | |
| parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) | |
Auto-update from upstream
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 d9f614a57731..ff291c973a56 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
| @@ -1985,7 +1985,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, | |||
| 1985 | * iput doesn't deadlock in reiserfs_delete_xattrs. The locking | 1985 | * iput doesn't deadlock in reiserfs_delete_xattrs. The locking |
| 1986 | * code really needs to be reworked, but this will take care of it | 1986 | * code really needs to be reworked, but this will take care of it |
| 1987 | * for now. -jeffm */ | 1987 | * for now. -jeffm */ |
| 1988 | if (REISERFS_I(dir)->i_acl_default) { | 1988 | if (REISERFS_I(dir)->i_acl_default && !IS_ERR(REISERFS_I(dir)->i_acl_default)) { |
| 1989 | reiserfs_write_unlock_xattrs(dir->i_sb); | 1989 | reiserfs_write_unlock_xattrs(dir->i_sb); |
| 1990 | iput(inode); | 1990 | iput(inode); |
| 1991 | reiserfs_write_lock_xattrs(dir->i_sb); | 1991 | reiserfs_write_lock_xattrs(dir->i_sb); |