diff --git a/[refs] b/[refs] index f84f66732e8d..4905b7bada24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b19a29af74c09553b9fef95cdf6e9af3df65f544 +refs/heads/master: 60d877334f7d9f5f2417ea4a83c1def769286102 diff --git a/trunk/fs/ceph/xattr.c b/trunk/fs/ceph/xattr.c index 1a48a55c5109..04769a3ab832 100644 --- a/trunk/fs/ceph/xattr.c +++ b/trunk/fs/ceph/xattr.c @@ -655,8 +655,10 @@ static int ceph_sync_setxattr(struct dentry *dentry, const char *name, /* do request */ req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_SETXATTR, USE_AUTH_MDS); - if (IS_ERR(req)) - return PTR_ERR(req); + if (IS_ERR(req)) { + err = PTR_ERR(req); + goto out; + } req->r_inode = igrab(inode); req->r_inode_drop = CEPH_CAP_XATTR_SHARED; req->r_num_caps = 1;