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>
This commit is contained in:
committed by
Linus Torvalds
parent
010f5a21a3
commit
6dfede6963
@@ -16,7 +16,7 @@ trusted_get(struct inode *inode, const char *name, void *buffer, size_t size)
|
||||
if (!reiserfs_xattrs(inode->i_sb))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
|
||||
if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode)))
|
||||
return -EPERM;
|
||||
|
||||
return reiserfs_xattr_get(inode, name, buffer, size);
|
||||
@@ -32,7 +32,7 @@ trusted_set(struct inode *inode, const char *name, const void *buffer,
|
||||
if (!reiserfs_xattrs(inode->i_sb))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
|
||||
if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode)))
|
||||
return -EPERM;
|
||||
|
||||
return reiserfs_xattr_set(inode, name, buffer, size, flags);
|
||||
@@ -46,7 +46,7 @@ static int trusted_del(struct inode *inode, const char *name)
|
||||
if (!reiserfs_xattrs(inode->i_sb))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
|
||||
if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode)))
|
||||
return -EPERM;
|
||||
|
||||
return 0;
|
||||
@@ -60,7 +60,7 @@ trusted_list(struct inode *inode, const char *name, int namelen, char *out)
|
||||
if (!reiserfs_xattrs(inode->i_sb))
|
||||
return 0;
|
||||
|
||||
if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
|
||||
if (!(capable(CAP_SYS_ADMIN) || IS_PRIVATE(inode)))
|
||||
return 0;
|
||||
|
||||
if (out)
|
||||
|
Reference in New Issue
Block a user