diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-17 22:58:58 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-29 04:56:51 -0400 |
commit | cd62cdae0bd7fb76cae66347dc4fc00e87ffc1c4 (patch) | |
tree | da8c125f785a28479685078620fd0d46d9c071b0 /fs/reiserfs/dir.c | |
parent | 99ce4169a9ff1c6ecdcccf01638eb6d76e5d84d1 (diff) |
reiserfs: switch reiserfs_readdir_dentry to inode
... and clean the callers up a bit
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/reiserfs/dir.c')
-rw-r--r-- | fs/reiserfs/dir.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c index df25fff3714a..03e4ca5624d6 100644 --- a/fs/reiserfs/dir.c +++ b/fs/reiserfs/dir.c | |||
@@ -57,9 +57,8 @@ static inline bool is_privroot_deh(struct inode *dir, struct reiserfs_de_head *d | |||
57 | deh->deh_objectid == INODE_PKEY(privroot->d_inode)->k_objectid); | 57 | deh->deh_objectid == INODE_PKEY(privroot->d_inode)->k_objectid); |
58 | } | 58 | } |
59 | 59 | ||
60 | int reiserfs_readdir_dentry(struct dentry *dentry, struct dir_context *ctx) | 60 | int reiserfs_readdir_inode(struct inode *inode, struct dir_context *ctx) |
61 | { | 61 | { |
62 | struct inode *inode = dentry->d_inode; | ||
63 | struct cpu_key pos_key; /* key of current position in the directory (key of directory entry) */ | 62 | struct cpu_key pos_key; /* key of current position in the directory (key of directory entry) */ |
64 | INITIALIZE_PATH(path_to_entry); | 63 | INITIALIZE_PATH(path_to_entry); |
65 | struct buffer_head *bh; | 64 | struct buffer_head *bh; |
@@ -243,7 +242,7 @@ out: | |||
243 | 242 | ||
244 | static int reiserfs_readdir(struct file *file, struct dir_context *ctx) | 243 | static int reiserfs_readdir(struct file *file, struct dir_context *ctx) |
245 | { | 244 | { |
246 | return reiserfs_readdir_dentry(file->f_path.dentry, ctx); | 245 | return reiserfs_readdir_inode(file_inode(file), ctx); |
247 | } | 246 | } |
248 | 247 | ||
249 | /* compose directory item containing "." and ".." entries (entries are | 248 | /* compose directory item containing "." and ".." entries (entries are |