diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 08:56:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 08:56:39 -0700 |
| commit | b612a0553714c6b9744ad0d03f10cac78f3a84b1 (patch) | |
| tree | 9dfb5cb5d13c187ff1f54448f8441512203625d0 /fs/ceph/file.c | |
| parent | 52b0ace7dfe8f70350218017a95d7cab1eb41fbb (diff) | |
| parent | 2a8e5e3637e2fc058798f5d3626f525729ffaaaf (diff) | |
| download | linux-3.10-b612a0553714c6b9744ad0d03f10cac78f3a84b1.tar.gz linux-3.10-b612a0553714c6b9744ad0d03f10cac78f3a84b1.tar.bz2 linux-3.10-b612a0553714c6b9744ad0d03f10cac78f3a84b1.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: clean up on forwarded aborted mds request
ceph: fix leak of osd authorizer
ceph: close out mds, osd connections before stopping auth
ceph: make lease code DN specific
fs/ceph: Use ERR_CAST
ceph: renew auth tickets before they expire
ceph: do not resend mon requests on auth ticket renewal
ceph: removed duplicated #includes
ceph: avoid possible null dereference
ceph: make mds requests killable, not interruptible
sched: add wait_for_completion_killable_timeout
Diffstat (limited to 'fs/ceph/file.c')
| -rw-r--r-- | fs/ceph/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 6512b6701b9..6251a1574b9 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -230,7 +230,7 @@ struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry, /* do the open */ req = prepare_open_request(dir->i_sb, flags, mode); if (IS_ERR(req)) - return ERR_PTR(PTR_ERR(req)); + return ERR_CAST(req); req->r_dentry = dget(dentry); req->r_num_caps = 2; if (flags & O_CREAT) { |