diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 15:27:09 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 15:27:09 (GMT) |
| commit | 44f549217cd26daf7063984ae4ee6e46beca9c41 (patch) | |
| tree | 8128955710d052cf2485857e58e616304989b13e /fs/jfs/super.c | |
| parent | 3e04767a4647ea6c61ed05abe803c052ce123960 (diff) | |
| parent | 63f83c9fcf40ab61b75edf5d2f2c1ae6bf876482 (diff) | |
| download | linux-fsl-qoriq-44f549217cd26daf7063984ae4ee6e46beca9c41.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
JFS: White space cleanup
[PATCH] JFS: return correct error when i-node allocation failed
JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()
Diffstat (limited to 'fs/jfs/super.c')
| -rw-r--r-- | fs/jfs/super.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 143bcd1..9c1c6e0 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -4,16 +4,16 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See * the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -82,7 +82,7 @@ static void jfs_handle_error(struct super_block *sb) "as read-only\n", sb->s_id); sb->s_flags |= MS_RDONLY; - } + } /* nothing is done for continue beyond marking the superblock dirty */ } @@ -422,7 +422,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) sbi = kzalloc(sizeof (struct jfs_sb_info), GFP_KERNEL); if (!sbi) - return -ENOSPC; + return -ENOMEM; sb->s_fs_info = sbi; sbi->sb = sb; sbi->uid = sbi->gid = sbi->umask = -1; @@ -775,7 +775,7 @@ static int __init init_jfs_fs(void) int rc; jfs_inode_cachep = - kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0, + kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, init_once, NULL); if (jfs_inode_cachep == NULL) |