]> git.ipfire.org Git - ipfire-2.x.git/blame - src/patches/suse-2.6.27.39/patches.suse/reiserfs-xattr-S_PRIVATE
projects / ipfire-2.x.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Imported linux-2.6.27.39 suse/xen patches.
[ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.suse / reiserfs-xattr-S_PRIVATE
CommitLineData
2cb7cef9
BS		 1From: Jeff Mahoney <jeffm@suse.com>
2Subject: reiserfs: remove IS_PRIVATE helpers
3
4 There are a number of helper functions for marking a reiserfs inode
5 private that were leftover from reiserfs did its own thing wrt to
6 private inodes. S_PRIVATE has been in the kernel for some time,
7 so this patch removes the helpers and uses IS_PRIVATE instead.
8
9Signed-off-by: Jeff Mahoney <jeffm@suse.com>
10---
11 fs/reiserfs/inode.c | 5 ++---
12 fs/reiserfs/namei.c | 7 ++++---
13 fs/reiserfs/xattr.c | 14 ++++++--------
14 fs/reiserfs/xattr_acl.c | 6 +++---
15 fs/reiserfs/xattr_security.c | 8 ++++----
16 fs/reiserfs/xattr_trusted.c | 8 ++++----
17 include/linux/reiserfs_xattr.h | 8 --------
18 7 files changed, 23 insertions(+), 33 deletions(-)
19
20--- a/fs/reiserfs/inode.c
21+++ b/fs/reiserfs/inode.c
22@@ -1932,9 +1932,8 @@ int reiserfs_new_inode(struct reiserfs_t
23 reiserfs_warning(inode->i_sb, "jdm-13090",
24 "ACLs aren't enabled in the fs, "
25 "but vfs thinks they are!");
26- } else if (is_reiserfs_priv_object(dir)) {
27- reiserfs_mark_inode_private(inode);
28- }
29+ } else if (IS_PRIVATE(dir))
30+ inode->i_flags |= S_PRIVATE;
31
32 insert_inode_hash(inode);
33 reiserfs_update_sd(th, inode);
34--- a/fs/reiserfs/namei.c
35+++ b/fs/reiserfs/namei.c
36@@ -358,9 +358,10 @@ static struct dentry *reiserfs_lookup(st
37 return ERR_PTR(-EACCES);
38 }
39
40- /* Propogate the priv_object flag so we know we're in the priv tree */
41- if (is_reiserfs_priv_object(dir))
42- reiserfs_mark_inode_private(inode);
43+ /* Propogate the private flag so we know we're
44+ * in the priv tree */
45+ if (IS_PRIVATE(dir))
46+ inode->i_flags |= S_PRIVATE;
47 }
48 reiserfs_write_unlock(dir->i_sb);
49 if (retval == IO_ERROR) {
50--- a/fs/reiserfs/xattr.c
51+++ b/fs/reiserfs/xattr.c
52@@ -633,14 +633,14 @@ __reiserfs_xattr_del(struct dentry *xadi
53 if (S_ISDIR(dentry->d_inode->i_mode))
54 goto out_file;
55
56- if (!is_reiserfs_priv_object(dentry->d_inode)) {
57+ if (!IS_PRIVATE(dentry->d_inode)) {
58 reiserfs_error(dir->i_sb, "jdm-20003",
59 "OID %08x [%.*s/%.*s] doesn't have "
60 "priv flag set [parent is %sset].",
61 le32_to_cpu(INODE_PKEY(dentry->d_inode)->
62 k_objectid), xadir->d_name.len,
63 xadir->d_name.name, namelen, name,
64- is_reiserfs_priv_object(xadir->d_inode) ? "" :
65+ IS_PRIVATE(xadir->d_inode) ? "" :
66 "not ");
67 dput(dentry);
68 return -EIO;
69@@ -701,8 +701,7 @@ int reiserfs_delete_xattrs(struct inode
70 int err = 0;
71
72 /* Skip out, an xattr has no xattrs associated with it */
73- if (is_reiserfs_priv_object(inode) ||
74- get_inode_sd_version(inode) == STAT_DATA_V1 ||
75+ if (IS_PRIVATE(inode) || get_inode_sd_version(inode) == STAT_DATA_V1 ||
76 !reiserfs_xattrs(inode->i_sb)) {
77 return 0;
78 }
79@@ -786,8 +785,7 @@ int reiserfs_chown_xattrs(struct inode *
80 unsigned int ia_valid = attrs->ia_valid;
81
82 /* Skip out, an xattr has no xattrs associated with it */
83- if (is_reiserfs_priv_object(inode) ||
84- get_inode_sd_version(inode) == STAT_DATA_V1 ||
85+ if (IS_PRIVATE(inode) || get_inode_sd_version(inode) == STAT_DATA_V1 ||
86 !reiserfs_xattrs(inode->i_sb)) {
87 return 0;
88 }
89@@ -1178,7 +1176,7 @@ int reiserfs_xattr_init(struct super_blo
90
91 if (!err && dentry) {
92 s->s_root->d_op = &xattr_lookup_poison_ops;
93- reiserfs_mark_inode_private(dentry->d_inode);
94+ dentry->d_inode->i_flags |= S_PRIVATE;
95 REISERFS_SB(s)->priv_root = dentry;
96 } else if (!(mount_flags & MS_RDONLY)) { /* xattrs are unavailable */
97 /* If we're read-only it just means that the dir hasn't been
98@@ -1239,7 +1237,7 @@ int reiserfs_permission(struct inode *in
99 * We don't do permission checks on the internal objects.
100 * Permissions are determined by the "owning" object.
101 */
102- if (is_reiserfs_priv_object(inode))
103+ if (IS_PRIVATE(inode))
104 return 0;
105
106 /*
107--- a/fs/reiserfs/xattr_acl.c
108+++ b/fs/reiserfs/xattr_acl.c
109@@ -335,8 +335,8 @@ reiserfs_inherit_default_acl(struct inod
110 /* Don't apply ACLs to objects in the .reiserfs_priv tree.. This
111 * would be useless since permissions are ignored, and a pain because
112 * it introduces locking cycles */
113- if (is_reiserfs_priv_object(dir)) {
114- reiserfs_mark_inode_private(inode);
115+ if (IS_PRIVATE(dir)) {
116+ inode->i_flags |= S_PRIVATE;
117 goto apply_umask;
118 }
119
120@@ -401,7 +401,7 @@ reiserfs_inherit_default_acl(struct inod
121 int reiserfs_cache_default_acl(struct inode *inode)
122 {
123 int ret = 0;
124- if (reiserfs_posixacl(inode->i_sb) && !is_reiserfs_priv_object(inode)) {
125+ if (reiserfs_posixacl(inode->i_sb) && !IS_PRIVATE(inode)) {
126 struct posix_acl *acl;
127 reiserfs_read_lock_xattr_i(inode);
128 reiserfs_read_lock_xattrs(inode->i_sb);
129--- a/fs/reiserfs/xattr_security.c
130+++ b/fs/reiserfs/xattr_security.c
131@@ -12,7 +12,7 @@ security_get(struct inode *inode, const
132 if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
133 return -EINVAL;
134
135- if (is_reiserfs_priv_object(inode))
136+ if (IS_PRIVATE(inode))
137 return -EPERM;
138
139 return reiserfs_xattr_get(inode, name, buffer, size);
140@@ -25,7 +25,7 @@ security_set(struct inode *inode, const
141 if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
142 return -EINVAL;
143
144- if (is_reiserfs_priv_object(inode))
145+ if (IS_PRIVATE(inode))
146 return -EPERM;
147
148 return reiserfs_xattr_set(inode, name, buffer, size, flags);
149@@ -36,7 +36,7 @@ static int security_del(struct inode *in
150 if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
151 return -EINVAL;
152
153- if (is_reiserfs_priv_object(inode))
154+ if (IS_PRIVATE(inode))
155 return -EPERM;
156
157 return 0;
158@@ -47,7 +47,7 @@ security_list(struct inode *inode, const
159 {
160 int len = namelen;
161
162- if (is_reiserfs_priv_object(inode))
163+ if (IS_PRIVATE(inode))
164 return 0;
165
166 if (out)
167--- a/fs/reiserfs/xattr_trusted.c
168+++ b/fs/reiserfs/xattr_trusted.c
169@@ -16,7 +16,7 @@ trusted_get(struct inode *inode, const c
170 if (!reiserfs_xattrs(inode->i_sb))
171 return -EOPNOTSUPP;
172
173- if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
174+ if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode)))
175 return -EPERM;
176
177 return reiserfs_xattr_get(inode, name, buffer, size);
178@@ -32,7 +32,7 @@ trusted_set(struct inode *inode, const c
179 if (!reiserfs_xattrs(inode->i_sb))
180 return -EOPNOTSUPP;
181
182- if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
183+ if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode)))
184 return -EPERM;
185
186 return reiserfs_xattr_set(inode, name, buffer, size, flags);
187@@ -46,7 +46,7 @@ static int trusted_del(struct inode *ino
188 if (!reiserfs_xattrs(inode->i_sb))
189 return -EOPNOTSUPP;
190
191- if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
192+ if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode)))
193 return -EPERM;
194
195 return 0;
196@@ -60,7 +60,7 @@ trusted_list(struct inode *inode, const
197 if (!reiserfs_xattrs(inode->i_sb))
198 return 0;
199
200- if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
201+ if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode)))
202 return 0;
203
204 if (out)
205--- a/include/linux/reiserfs_xattr.h
206+++ b/include/linux/reiserfs_xattr.h
207@@ -44,7 +44,6 @@ struct reiserfs_xattr_handler {
208 };
209
210 #ifdef CONFIG_REISERFS_FS_XATTR
211-#define is_reiserfs_priv_object(inode) IS_PRIVATE(inode)
212 #define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir)
213 ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name,
214 void *buffer, size_t size);
215@@ -104,11 +103,6 @@ static inline void reiserfs_read_unlock_
216 up_read(&REISERFS_I(inode)->xattr_sem);
217 }
218
219-static inline void reiserfs_mark_inode_private(struct inode *inode)
220-{
221- inode->i_flags |= S_PRIVATE;
222-}
223-
224 static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
225 {
226 init_rwsem(&REISERFS_I(inode)->xattr_sem);
227@@ -116,8 +110,6 @@ static inline void reiserfs_init_xattr_r
228
229 #else
230
231-#define is_reiserfs_priv_object(inode) 0
232-#define reiserfs_mark_inode_private(inode) do {;} while(0)
233 #define reiserfs_getxattr NULL
234 #define reiserfs_setxattr NULL
235 #define reiserfs_listxattr NULL
IPFire 2.x development tree