aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/xattr.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ceph/xattr.c')
-rw-r--r--fs/ceph/xattr.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 5a492caf34cb..e448766ce549 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -776,12 +776,12 @@ ssize_t ceph_getxattr(struct dentry *dentry, const char *name, void *value,
776 if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN)) 776 if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
777 return generic_getxattr(dentry, name, value, size); 777 return generic_getxattr(dentry, name, value, size);
778 778
779 return __ceph_getxattr(dentry->d_inode, name, value, size); 779 return __ceph_getxattr(d_inode(dentry), name, value, size);
780} 780}
781 781
782ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size) 782ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size)
783{ 783{
784 struct inode *inode = dentry->d_inode; 784 struct inode *inode = d_inode(dentry);
785 struct ceph_inode_info *ci = ceph_inode(inode); 785 struct ceph_inode_info *ci = ceph_inode(inode);
786 struct ceph_vxattr *vxattrs = ceph_inode_vxattrs(inode); 786 struct ceph_vxattr *vxattrs = ceph_inode_vxattrs(inode);
787 u32 vir_namelen = 0; 787 u32 vir_namelen = 0;
@@ -847,7 +847,7 @@ static int ceph_sync_setxattr(struct dentry *dentry, const char *name,
847 const char *value, size_t size, int flags) 847 const char *value, size_t size, int flags)
848{ 848{
849 struct ceph_fs_client *fsc = ceph_sb_to_client(dentry->d_sb); 849 struct ceph_fs_client *fsc = ceph_sb_to_client(dentry->d_sb);
850 struct inode *inode = dentry->d_inode; 850 struct inode *inode = d_inode(dentry);
851 struct ceph_inode_info *ci = ceph_inode(inode); 851 struct ceph_inode_info *ci = ceph_inode(inode);
852 struct ceph_mds_request *req; 852 struct ceph_mds_request *req;
853 struct ceph_mds_client *mdsc = fsc->mdsc; 853 struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -901,7 +901,7 @@ out:
901int __ceph_setxattr(struct dentry *dentry, const char *name, 901int __ceph_setxattr(struct dentry *dentry, const char *name,
902 const void *value, size_t size, int flags) 902 const void *value, size_t size, int flags)
903{ 903{
904 struct inode *inode = dentry->d_inode; 904 struct inode *inode = d_inode(dentry);
905 struct ceph_vxattr *vxattr; 905 struct ceph_vxattr *vxattr;
906 struct ceph_inode_info *ci = ceph_inode(inode); 906 struct ceph_inode_info *ci = ceph_inode(inode);
907 int issued; 907 int issued;
@@ -995,7 +995,7 @@ out:
995int ceph_setxattr(struct dentry *dentry, const char *name, 995int ceph_setxattr(struct dentry *dentry, const char *name,
996 const void *value, size_t size, int flags) 996 const void *value, size_t size, int flags)
997{ 997{
998 if (ceph_snap(dentry->d_inode) != CEPH_NOSNAP) 998 if (ceph_snap(d_inode(dentry)) != CEPH_NOSNAP)
999 return -EROFS; 999 return -EROFS;
1000 1000
1001 if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN)) 1001 if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
@@ -1011,7 +1011,7 @@ static int ceph_send_removexattr(struct dentry *dentry, const char *name)
1011{ 1011{
1012 struct ceph_fs_client *fsc = ceph_sb_to_client(dentry->d_sb); 1012 struct ceph_fs_client *fsc = ceph_sb_to_client(dentry->d_sb);
1013 struct ceph_mds_client *mdsc = fsc->mdsc; 1013 struct ceph_mds_client *mdsc = fsc->mdsc;
1014 struct inode *inode = dentry->d_inode; 1014 struct inode *inode = d_inode(dentry);
1015 struct ceph_mds_request *req; 1015 struct ceph_mds_request *req;
1016 int err; 1016 int err;
1017 1017
@@ -1032,7 +1032,7 @@ static int ceph_send_removexattr(struct dentry *dentry, const char *name)
1032 1032
1033int __ceph_removexattr(struct dentry *dentry, const char *name) 1033int __ceph_removexattr(struct dentry *dentry, const char *name)
1034{ 1034{
1035 struct inode *inode = dentry->d_inode; 1035 struct inode *inode = d_inode(dentry);
1036 struct ceph_vxattr *vxattr; 1036 struct ceph_vxattr *vxattr;
1037 struct ceph_inode_info *ci = ceph_inode(inode); 1037 struct ceph_inode_info *ci = ceph_inode(inode);
1038 int issued; 1038 int issued;
@@ -1098,7 +1098,7 @@ out:
1098 1098
1099int ceph_removexattr(struct dentry *dentry, const char *name) 1099int ceph_removexattr(struct dentry *dentry, const char *name)
1100{ 1100{
1101 if (ceph_snap(dentry->d_inode) != CEPH_NOSNAP) 1101 if (ceph_snap(d_inode(dentry)) != CEPH_NOSNAP)
1102 return -EROFS; 1102 return -EROFS;
1103 1103
1104 if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN)) 1104 if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))