aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hfsplus/inode.c
diff options
context:
space:
mode:
authorAnton Salikhmetov <alexo@tuxera.com>2010-12-16 11:08:38 -0500
committerChristoph Hellwig <hch@tuxera.com>2010-12-16 12:08:45 -0500
commit2753cc281c9a0e8a0a45ee2b8110866a9fe63bdd (patch)
treed28794ef990637cfcd734a8b467f119e6d69dac1 /fs/hfsplus/inode.c
parent596276c3571e2108f4b336be545ece2eacf3da59 (diff)
hfsplus: over 80 character lines clean-up
Match coding style line length limitation where checkpatch.pl reported over-80-character-line warnings. Signed-off-by: Anton Salikhmetov <alexo@tuxera.com> Signed-off-by: Christoph Hellwig <hch@tuxera.com>
Diffstat (limited to 'fs/hfsplus/inode.c')
-rw-r--r--fs/hfsplus/inode.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index bda7464c205d..8d7350e5ce0d 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -78,7 +78,8 @@ static int hfsplus_releasepage(struct page *page, gfp_t mask)
78 if (!tree) 78 if (!tree)
79 return 0; 79 return 0;
80 if (tree->node_size >= PAGE_CACHE_SIZE) { 80 if (tree->node_size >= PAGE_CACHE_SIZE) {
81 nidx = page->index >> (tree->node_size_shift - PAGE_CACHE_SHIFT); 81 nidx = page->index >>
82 (tree->node_size_shift - PAGE_CACHE_SHIFT);
82 spin_lock(&tree->hash_lock); 83 spin_lock(&tree->hash_lock);
83 node = hfs_bnode_findhash(tree, nidx); 84 node = hfs_bnode_findhash(tree, nidx);
84 if (!node) 85 if (!node)
@@ -91,7 +92,8 @@ static int hfsplus_releasepage(struct page *page, gfp_t mask)
91 } 92 }
92 spin_unlock(&tree->hash_lock); 93 spin_unlock(&tree->hash_lock);
93 } else { 94 } else {
94 nidx = page->index << (PAGE_CACHE_SHIFT - tree->node_size_shift); 95 nidx = page->index <<
96 (PAGE_CACHE_SHIFT - tree->node_size_shift);
95 i = 1 << (PAGE_CACHE_SHIFT - tree->node_size_shift); 97 i = 1 << (PAGE_CACHE_SHIFT - tree->node_size_shift);
96 spin_lock(&tree->hash_lock); 98 spin_lock(&tree->hash_lock);
97 do { 99 do {
@@ -167,8 +169,8 @@ const struct dentry_operations hfsplus_dentry_operations = {
167 .d_compare = hfsplus_compare_dentry, 169 .d_compare = hfsplus_compare_dentry,
168}; 170};
169 171
170static struct dentry *hfsplus_file_lookup(struct inode *dir, struct dentry *dentry, 172static struct dentry *hfsplus_file_lookup(struct inode *dir,
171 struct nameidata *nd) 173 struct dentry *dentry, struct nameidata *nd)
172{ 174{
173 struct hfs_find_data fd; 175 struct hfs_find_data fd;
174 struct super_block *sb = dir->i_sb; 176 struct super_block *sb = dir->i_sb;
@@ -222,7 +224,8 @@ out:
222 return NULL; 224 return NULL;
223} 225}
224 226
225static void hfsplus_get_perms(struct inode *inode, struct hfsplus_perm *perms, int dir) 227static void hfsplus_get_perms(struct inode *inode,
228 struct hfsplus_perm *perms, int dir)
226{ 229{
227 struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb); 230 struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb);
228 u16 mode; 231 u16 mode;
@@ -324,7 +327,8 @@ int hfsplus_file_fsync(struct file *file, int datasync)
324 error = filemap_write_and_wait(sbi->cat_tree->inode->i_mapping); 327 error = filemap_write_and_wait(sbi->cat_tree->inode->i_mapping);
325 328
326 if (test_and_clear_bit(HFSPLUS_I_EXT_DIRTY, &hip->flags)) { 329 if (test_and_clear_bit(HFSPLUS_I_EXT_DIRTY, &hip->flags)) {
327 error2 = filemap_write_and_wait(sbi->ext_tree->inode->i_mapping); 330 error2 =
331 filemap_write_and_wait(sbi->ext_tree->inode->i_mapping);
328 if (!error) 332 if (!error)
329 error = error2; 333 error = error2;
330 } 334 }
@@ -472,7 +476,8 @@ void hfsplus_inode_read_fork(struct inode *inode, struct hfsplus_fork_raw *fork)
472 } 476 }
473} 477}
474 478
475void hfsplus_inode_write_fork(struct inode *inode, struct hfsplus_fork_raw *fork) 479void hfsplus_inode_write_fork(struct inode *inode,
480 struct hfsplus_fork_raw *fork)
476{ 481{
477 memcpy(&fork->extents, &HFSPLUS_I(inode)->first_extents, 482 memcpy(&fork->extents, &HFSPLUS_I(inode)->first_extents,
478 sizeof(hfsplus_extent_rec)); 483 sizeof(hfsplus_extent_rec));
@@ -520,7 +525,8 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)
520 inode->i_nlink = 1; 525 inode->i_nlink = 1;
521 if (S_ISREG(inode->i_mode)) { 526 if (S_ISREG(inode->i_mode)) {
522 if (file->permissions.dev) 527 if (file->permissions.dev)
523 inode->i_nlink = be32_to_cpu(file->permissions.dev); 528 inode->i_nlink =
529 be32_to_cpu(file->permissions.dev);
524 inode->i_op = &hfsplus_file_inode_operations; 530 inode->i_op = &hfsplus_file_inode_operations;
525 inode->i_fop = &hfsplus_file_operations; 531 inode->i_fop = &hfsplus_file_operations;
526 inode->i_mapping->a_ops = &hfsplus_aops; 532 inode->i_mapping->a_ops = &hfsplus_aops;
@@ -593,7 +599,9 @@ int hfsplus_cat_write_inode(struct inode *inode)
593 sizeof(struct hfsplus_cat_file)); 599 sizeof(struct hfsplus_cat_file));
594 hfsplus_inode_write_fork(inode, &file->data_fork); 600 hfsplus_inode_write_fork(inode, &file->data_fork);
595 hfsplus_cat_set_perms(inode, &file->permissions); 601 hfsplus_cat_set_perms(inode, &file->permissions);
596 if ((file->permissions.rootflags | file->permissions.userflags) & HFSPLUS_FLG_IMMUTABLE) 602 if (HFSPLUS_FLG_IMMUTABLE &
603 (file->permissions.rootflags |
604 file->permissions.userflags))
597 file->flags |= cpu_to_be16(HFSPLUS_FILE_LOCKED); 605 file->flags |= cpu_to_be16(HFSPLUS_FILE_LOCKED);
598 else 606 else
599 file->flags &= cpu_to_be16(~HFSPLUS_FILE_LOCKED); 607 file->flags &= cpu_to_be16(~HFSPLUS_FILE_LOCKED);