projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
[powerpc.git]
/
fs
/
hfs
/
dir.c
diff --git
a/fs/hfs/dir.c
b/fs/hfs/dir.c
index
7cd8cc0
..
7c69b98
100644
(file)
--- a/
fs/hfs/dir.c
+++ b/
fs/hfs/dir.c
@@
-53,7
+53,7
@@
done:
*/
static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
{
*/
static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
{
- struct inode *inode = filp->f_dentry->d_inode;
+ struct inode *inode = filp->f_
path.
dentry->d_inode;
struct super_block *sb = inode->i_sb;
int len, err;
char strbuf[HFS_MAX_NAMELEN];
struct super_block *sb = inode->i_sb;
int len, err;
char strbuf[HFS_MAX_NAMELEN];
@@
-246,7
+246,7
@@
static int hfs_unlink(struct inode *dir, struct dentry *dentry)
if (res)
return res;
if (res)
return res;
-
inode->i_nlink--
;
+
drop_nlink(inode)
;
hfs_delete_inode(inode);
inode->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(inode);
hfs_delete_inode(inode);
inode->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(inode);
@@
-273,7
+273,7
@@
static int hfs_rmdir(struct inode *dir, struct dentry *dentry)
res = hfs_cat_delete(inode->i_ino, dir, &dentry->d_name);
if (res)
return res;
res = hfs_cat_delete(inode->i_ino, dir, &dentry->d_name);
if (res)
return res;
-
inode->i_nlink = 0
;
+
clear_nlink(inode)
;
inode->i_ctime = CURRENT_TIME_SEC;
hfs_delete_inode(inode);
mark_inode_dirty(inode);
inode->i_ctime = CURRENT_TIME_SEC;
hfs_delete_inode(inode);
mark_inode_dirty(inode);
@@
-320,7
+320,7
@@
const struct file_operations hfs_dir_operations = {
.release = hfs_dir_release,
};
.release = hfs_dir_release,
};
-struct inode_operations hfs_dir_inode_operations = {
+
const
struct inode_operations hfs_dir_inode_operations = {
.create = hfs_create,
.lookup = hfs_lookup,
.unlink = hfs_unlink,
.create = hfs_create,
.lookup = hfs_lookup,
.unlink = hfs_unlink,