UDF: coding style conversion - lindent
This patch converts UDF coding style to kernel coding style using Lindent. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: Jan Kara <jack@ucw.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
95a631e2d9
commit
cb00ea3528
@@ -28,7 +28,7 @@
|
||||
#include "udf_i.h"
|
||||
#include "udf_sb.h"
|
||||
|
||||
void udf_free_inode(struct inode * inode)
|
||||
void udf_free_inode(struct inode *inode)
|
||||
{
|
||||
struct super_block *sb = inode->i_sb;
|
||||
struct udf_sb_info *sbi = UDF_SB(sb);
|
||||
@@ -46,10 +46,12 @@ void udf_free_inode(struct inode * inode)
|
||||
if (sbi->s_lvidbh) {
|
||||
if (S_ISDIR(inode->i_mode))
|
||||
UDF_SB_LVIDIU(sb)->numDirs =
|
||||
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numDirs) - 1);
|
||||
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numDirs)
|
||||
- 1);
|
||||
else
|
||||
UDF_SB_LVIDIU(sb)->numFiles =
|
||||
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numFiles) - 1);
|
||||
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numFiles)
|
||||
- 1);
|
||||
|
||||
mark_buffer_dirty(sbi->s_lvidbh);
|
||||
}
|
||||
@@ -58,18 +60,17 @@ void udf_free_inode(struct inode * inode)
|
||||
udf_free_blocks(sb, NULL, UDF_I_LOCATION(inode), 0, 1);
|
||||
}
|
||||
|
||||
struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
|
||||
struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
|
||||
{
|
||||
struct super_block *sb = dir->i_sb;
|
||||
struct udf_sb_info *sbi = UDF_SB(sb);
|
||||
struct inode * inode;
|
||||
struct inode *inode;
|
||||
int block;
|
||||
uint32_t start = UDF_I_LOCATION(dir).logicalBlockNum;
|
||||
|
||||
inode = new_inode(sb);
|
||||
|
||||
if (!inode)
|
||||
{
|
||||
if (!inode) {
|
||||
*err = -ENOMEM;
|
||||
return NULL;
|
||||
}
|
||||
@@ -81,26 +82,30 @@ struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
|
||||
UDF_I_NEXT_ALLOC_GOAL(inode) = 0;
|
||||
UDF_I_STRAT4096(inode) = 0;
|
||||
|
||||
block = udf_new_block(dir->i_sb, NULL, UDF_I_LOCATION(dir).partitionReferenceNum,
|
||||
start, err);
|
||||
if (*err)
|
||||
{
|
||||
block =
|
||||
udf_new_block(dir->i_sb, NULL,
|
||||
UDF_I_LOCATION(dir).partitionReferenceNum, start,
|
||||
err);
|
||||
if (*err) {
|
||||
iput(inode);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
mutex_lock(&sbi->s_alloc_mutex);
|
||||
if (UDF_SB_LVIDBH(sb))
|
||||
{
|
||||
if (UDF_SB_LVIDBH(sb)) {
|
||||
struct logicalVolHeaderDesc *lvhd;
|
||||
uint64_t uniqueID;
|
||||
lvhd = (struct logicalVolHeaderDesc *)(UDF_SB_LVID(sb)->logicalVolContentsUse);
|
||||
lvhd =
|
||||
(struct logicalVolHeaderDesc *)(UDF_SB_LVID(sb)->
|
||||
logicalVolContentsUse);
|
||||
if (S_ISDIR(mode))
|
||||
UDF_SB_LVIDIU(sb)->numDirs =
|
||||
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numDirs) + 1);
|
||||
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numDirs)
|
||||
+ 1);
|
||||
else
|
||||
UDF_SB_LVIDIU(sb)->numFiles =
|
||||
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numFiles) + 1);
|
||||
cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numFiles)
|
||||
+ 1);
|
||||
UDF_I_UNIQUE(inode) = uniqueID = le64_to_cpu(lvhd->uniqueID);
|
||||
if (!(++uniqueID & 0x00000000FFFFFFFFUL))
|
||||
uniqueID += 16;
|
||||
@@ -109,35 +114,34 @@ struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
|
||||
}
|
||||
inode->i_mode = mode;
|
||||
inode->i_uid = current->fsuid;
|
||||
if (dir->i_mode & S_ISGID)
|
||||
{
|
||||
if (dir->i_mode & S_ISGID) {
|
||||
inode->i_gid = dir->i_gid;
|
||||
if (S_ISDIR(mode))
|
||||
mode |= S_ISGID;
|
||||
}
|
||||
else
|
||||
} else
|
||||
inode->i_gid = current->fsgid;
|
||||
|
||||
UDF_I_LOCATION(inode).logicalBlockNum = block;
|
||||
UDF_I_LOCATION(inode).partitionReferenceNum = UDF_I_LOCATION(dir).partitionReferenceNum;
|
||||
UDF_I_LOCATION(inode).partitionReferenceNum =
|
||||
UDF_I_LOCATION(dir).partitionReferenceNum;
|
||||
inode->i_ino = udf_get_lb_pblock(sb, UDF_I_LOCATION(inode), 0);
|
||||
inode->i_blocks = 0;
|
||||
UDF_I_LENEATTR(inode) = 0;
|
||||
UDF_I_LENALLOC(inode) = 0;
|
||||
UDF_I_USE(inode) = 0;
|
||||
if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_EXTENDED_FE))
|
||||
{
|
||||
if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_EXTENDED_FE)) {
|
||||
UDF_I_EFE(inode) = 1;
|
||||
UDF_UPDATE_UDFREV(inode->i_sb, UDF_VERS_USE_EXTENDED_FE);
|
||||
UDF_I_DATA(inode) = kzalloc(inode->i_sb->s_blocksize - sizeof(struct extendedFileEntry), GFP_KERNEL);
|
||||
}
|
||||
else
|
||||
{
|
||||
UDF_I_DATA(inode) =
|
||||
kzalloc(inode->i_sb->s_blocksize -
|
||||
sizeof(struct extendedFileEntry), GFP_KERNEL);
|
||||
} else {
|
||||
UDF_I_EFE(inode) = 0;
|
||||
UDF_I_DATA(inode) = kzalloc(inode->i_sb->s_blocksize - sizeof(struct fileEntry), GFP_KERNEL);
|
||||
UDF_I_DATA(inode) =
|
||||
kzalloc(inode->i_sb->s_blocksize - sizeof(struct fileEntry),
|
||||
GFP_KERNEL);
|
||||
}
|
||||
if (!UDF_I_DATA(inode))
|
||||
{
|
||||
if (!UDF_I_DATA(inode)) {
|
||||
iput(inode);
|
||||
*err = -ENOMEM;
|
||||
mutex_unlock(&sbi->s_alloc_mutex);
|
||||
@@ -150,13 +154,12 @@ struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
|
||||
else
|
||||
UDF_I_ALLOCTYPE(inode) = ICBTAG_FLAG_AD_LONG;
|
||||
inode->i_mtime = inode->i_atime = inode->i_ctime =
|
||||
UDF_I_CRTIME(inode) = current_fs_time(inode->i_sb);
|
||||
UDF_I_CRTIME(inode) = current_fs_time(inode->i_sb);
|
||||
insert_inode_hash(inode);
|
||||
mark_inode_dirty(inode);
|
||||
mutex_unlock(&sbi->s_alloc_mutex);
|
||||
|
||||
if (DQUOT_ALLOC_INODE(inode))
|
||||
{
|
||||
if (DQUOT_ALLOC_INODE(inode)) {
|
||||
DQUOT_DROP(inode);
|
||||
inode->i_flags |= S_NOQUOTA;
|
||||
inode->i_nlink = 0;
|
||||
|
Reference in New Issue
Block a user