diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:50:59 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:01:23 -0400 |
| commit | 835f9c38bbb4498c3d43b7466964bdadbb1fd244 (patch) | |
| tree | ade5aec66bc7ddb97048c4f141932de0f93369b9 /fs/ext2/ialloc.c | |
| parent | f5f29151588744ea2e283971cb0ad403ee04e3e2 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
Merge tag 'v3.9-rc3' into next/multiplatform
Linux 3.9-rc3
Conflicts:
arch/arm/Kconfig
arch/arm/mach-spear/spear3xx.c
arch/arm/plat-spear/Kconfig
This is a dependency for ux500/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/ext2/ialloc.c')
| -rw-r--r-- | fs/ext2/ialloc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index 8f370e012e61..7cadd823bb31 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c | |||
| @@ -118,7 +118,6 @@ void ext2_free_inode (struct inode * inode) | |||
| 118 | * as writing the quota to disk may need the lock as well. | 118 | * as writing the quota to disk may need the lock as well. |
| 119 | */ | 119 | */ |
| 120 | /* Quota is already initialized in iput() */ | 120 | /* Quota is already initialized in iput() */ |
| 121 | ext2_xattr_delete_inode(inode); | ||
| 122 | dquot_free_inode(inode); | 121 | dquot_free_inode(inode); |
| 123 | dquot_drop(inode); | 122 | dquot_drop(inode); |
| 124 | 123 | ||