]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Jeff Mahoney <jeffm@suse.com> |
2 | Subject: reiserfs: small variable cleanup | |
3 | ||
4 | This patch removes the xinode and mapping variables from | |
5 | reiserfs_xattr_{get,set}. | |
6 | ||
7 | Signed-off-by: Jeff Mahoney <jeffm@suse.com> | |
8 | --- | |
9 | fs/reiserfs/xattr.c | 20 ++++++++------------ | |
10 | 1 file changed, 8 insertions(+), 12 deletions(-) | |
11 | ||
12 | --- a/fs/reiserfs/xattr.c | |
13 | +++ b/fs/reiserfs/xattr.c | |
14 | @@ -420,10 +420,8 @@ reiserfs_xattr_set(struct inode *inode, | |
15 | struct dentry *dentry; | |
16 | struct page *page; | |
17 | char *data; | |
18 | - struct address_space *mapping; | |
19 | size_t file_pos = 0; | |
20 | size_t buffer_pos = 0; | |
21 | - struct inode *xinode; | |
22 | struct iattr newattrs; | |
23 | __u32 xahash = 0; | |
24 | ||
25 | @@ -441,11 +439,10 @@ reiserfs_xattr_set(struct inode *inode, | |
26 | goto out; | |
27 | } | |
28 | ||
29 | - xinode = dentry->d_inode; | |
30 | REISERFS_I(inode)->i_flags |= i_has_xattr_dir; | |
31 | ||
32 | /* we need to copy it off.. */ | |
33 | - if (xinode->i_nlink > 1) { | |
34 | + if (dentry->d_inode->i_nlink > 1) { | |
35 | dput(dentry); | |
36 | err = reiserfs_xattr_del(inode, name); | |
37 | if (err < 0) | |
38 | @@ -459,12 +456,11 @@ reiserfs_xattr_set(struct inode *inode, | |
39 | /* Resize it so we're ok to write there */ | |
40 | newattrs.ia_size = buffer_size; | |
41 | newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; | |
42 | - mutex_lock_nested(&xinode->i_mutex, I_MUTEX_XATTR); | |
43 | + mutex_lock_nested(&dentry->d_inode->i_mutex, I_MUTEX_XATTR); | |
44 | err = notify_change(dentry, &newattrs); | |
45 | if (err) | |
46 | goto out_filp; | |
47 | ||
48 | - mapping = xinode->i_mapping; | |
49 | while (buffer_pos < buffer_size || buffer_pos == 0) { | |
50 | size_t chunk; | |
51 | size_t skip = 0; | |
52 | @@ -474,7 +470,8 @@ reiserfs_xattr_set(struct inode *inode, | |
53 | else | |
54 | chunk = buffer_size - buffer_pos; | |
55 | ||
56 | - page = reiserfs_get_page(xinode, file_pos >> PAGE_CACHE_SHIFT); | |
57 | + page = reiserfs_get_page(dentry->d_inode, | |
58 | + file_pos >> PAGE_CACHE_SHIFT); | |
59 | if (IS_ERR(page)) { | |
60 | err = PTR_ERR(page); | |
61 | goto out_filp; | |
62 | @@ -521,7 +518,7 @@ reiserfs_xattr_set(struct inode *inode, | |
63 | } | |
64 | ||
65 | out_filp: | |
66 | - mutex_unlock(&xinode->i_mutex); | |
67 | + mutex_unlock(&dentry->d_inode->i_mutex); | |
68 | dput(dentry); | |
69 | ||
70 | out: | |
71 | @@ -541,7 +538,6 @@ reiserfs_xattr_get(const struct inode *i | |
72 | size_t file_pos = 0; | |
73 | size_t buffer_pos = 0; | |
74 | struct page *page; | |
75 | - struct inode *xinode; | |
76 | __u32 hash = 0; | |
77 | ||
78 | if (name == NULL) | |
79 | @@ -558,8 +554,7 @@ reiserfs_xattr_get(const struct inode *i | |
80 | goto out; | |
81 | } | |
82 | ||
83 | - xinode = dentry->d_inode; | |
84 | - isize = xinode->i_size; | |
85 | + isize = i_size_read(dentry->d_inode); | |
86 | REISERFS_I(inode)->i_flags |= i_has_xattr_dir; | |
87 | ||
88 | /* Just return the size needed */ | |
89 | @@ -582,7 +577,8 @@ reiserfs_xattr_get(const struct inode *i | |
90 | else | |
91 | chunk = isize - file_pos; | |
92 | ||
93 | - page = reiserfs_get_page(xinode, file_pos >> PAGE_CACHE_SHIFT); | |
94 | + page = reiserfs_get_page(dentry->d_inode, | |
95 | + file_pos >> PAGE_CACHE_SHIFT); | |
96 | if (IS_ERR(page)) { | |
97 | err = PTR_ERR(page); | |
98 | goto out_dput; |