diff options
author | Jeff Mahoney <jeffm@suse.com> | 2009-03-30 14:02:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 15:16:37 -0400 |
commit | 6dfede696391133eadd7ce90b61c9573ee6e5a90 (patch) | |
tree | 2051bfc5108d0e7592b8738e43f4ae972d398ccd /fs/reiserfs/xattr_acl.c | |
parent | 010f5a21a323e7383e067009a7785462883fe5ea (diff) |
reiserfs: remove IS_PRIVATE helpers
There are a number of helper functions for marking a reiserfs inode
private that were leftover from reiserfs did its own thing wrt to
private inodes. S_PRIVATE has been in the kernel for some time, so this
patch removes the helpers and uses IS_PRIVATE instead.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/xattr_acl.c')
-rw-r--r-- | fs/reiserfs/xattr_acl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index b7e4fa4539de..9128e4d5ba64 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c | |||
@@ -335,8 +335,8 @@ reiserfs_inherit_default_acl(struct inode *dir, struct dentry *dentry, | |||
335 | /* Don't apply ACLs to objects in the .reiserfs_priv tree.. This | 335 | /* Don't apply ACLs to objects in the .reiserfs_priv tree.. This |
336 | * would be useless since permissions are ignored, and a pain because | 336 | * would be useless since permissions are ignored, and a pain because |
337 | * it introduces locking cycles */ | 337 | * it introduces locking cycles */ |
338 | if (is_reiserfs_priv_object(dir)) { | 338 | if (IS_PRIVATE(dir)) { |
339 | reiserfs_mark_inode_private(inode); | 339 | inode->i_flags |= S_PRIVATE; |
340 | goto apply_umask; | 340 | goto apply_umask; |
341 | } | 341 | } |
342 | 342 | ||
@@ -401,7 +401,7 @@ reiserfs_inherit_default_acl(struct inode *dir, struct dentry *dentry, | |||
401 | int reiserfs_cache_default_acl(struct inode *inode) | 401 | int reiserfs_cache_default_acl(struct inode *inode) |
402 | { | 402 | { |
403 | int ret = 0; | 403 | int ret = 0; |
404 | if (reiserfs_posixacl(inode->i_sb) && !is_reiserfs_priv_object(inode)) { | 404 | if (reiserfs_posixacl(inode->i_sb) && !IS_PRIVATE(inode)) { |
405 | struct posix_acl *acl; | 405 | struct posix_acl *acl; |
406 | reiserfs_read_lock_xattr_i(inode); | 406 | reiserfs_read_lock_xattr_i(inode); |
407 | reiserfs_read_lock_xattrs(inode->i_sb); | 407 | reiserfs_read_lock_xattrs(inode->i_sb); |