diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /fs/affs/inode.c | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'fs/affs/inode.c')
| -rw-r--r-- | fs/affs/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/affs/inode.c b/fs/affs/inode.c index 415d9c67ac16..3c4ec7d864c4 100644 --- a/fs/affs/inode.c +++ b/fs/affs/inode.c | |||
| @@ -119,8 +119,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino) | |||
| 119 | goto bad_inode; | 119 | goto bad_inode; |
| 120 | #else | 120 | #else |
| 121 | inode->i_mode |= S_IFDIR; | 121 | inode->i_mode |= S_IFDIR; |
| 122 | inode->i_op = NULL; | 122 | /* ... and leave ->i_op and ->i_fop pointing to empty */ |
| 123 | inode->i_fop = NULL; | ||
| 124 | break; | 123 | break; |
| 125 | #endif | 124 | #endif |
| 126 | case ST_LINKFILE: | 125 | case ST_LINKFILE: |