diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /fs/omfs/dir.c | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'fs/omfs/dir.c')
| -rw-r--r-- | fs/omfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c index 3b8d3979e03b..98e544274390 100644 --- a/fs/omfs/dir.c +++ b/fs/omfs/dir.c | |||
| @@ -93,7 +93,7 @@ int omfs_make_empty(struct inode *inode, struct super_block *sb) | |||
| 93 | 93 | ||
| 94 | memset(bh->b_data, 0, sizeof(struct omfs_inode)); | 94 | memset(bh->b_data, 0, sizeof(struct omfs_inode)); |
| 95 | 95 | ||
| 96 | if (inode->i_mode & S_IFDIR) { | 96 | if (S_ISDIR(inode->i_mode)) { |
| 97 | memset(&bh->b_data[OMFS_DIR_START], 0xff, | 97 | memset(&bh->b_data[OMFS_DIR_START], 0xff, |
| 98 | sbi->s_sys_blocksize - OMFS_DIR_START); | 98 | sbi->s_sys_blocksize - OMFS_DIR_START); |
| 99 | } else | 99 | } else |