diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 17:46:04 +0200 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 17:46:04 +0200 |
commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
tree | e8006368b6f643067486f92405a404757807d6da /fs/reiserfs/inode.c | |
parent | [MTD] NAND: nandsim: support subpage write (diff) | |
parent | [PATCH] fix PXA2xx UDC compilation error (diff) | |
download | linux-513b046c96cc2fbce730a3474f6f7ff0c4fdd05c.tar.xz linux-513b046c96cc2fbce730a3474f6f7ff0c4fdd05c.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/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 7e5a2f5ebeb0..9c69bcacad22 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -1780,7 +1780,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, err = -EDQUOT; goto out_end_trans; } - if (!dir || !dir->i_nlink) { + if (!dir->i_nlink) { err = -EPERM; goto out_bad_inode; } |