diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 11:46:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 11:46:31 -0700 |
| commit | 57bb55957432f20fd6e5bb5ddfbd9987439157ec (patch) | |
| tree | de4adeffd13a5394b84f04c6f60582b63685adc9 /include/linux | |
| parent | 2a651c7f8d377cf88271374315cbb5fe82eac784 (diff) | |
| parent | db3540522e955c1ebb391f4f5324dff4f20ecd09 (diff) | |
| download | linux-57bb55957432f20fd6e5bb5ddfbd9987439157ec.tar.gz linux-57bb55957432f20fd6e5bb5ddfbd9987439157ec.tar.bz2 linux-57bb55957432f20fd6e5bb5ddfbd9987439157ec.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: (23 commits)
ceph: fix cap flush race reentrancy
libceph: subscribe to osdmap when cluster is full
libceph: handle new osdmap down/state change encoding
rbd: handle online resize of underlying rbd image
ceph: avoid inode lookup on nfs fh reconnect
ceph: use LOOKUPINO to make unconnected nfs fh more reliable
rbd: use snprintf for disk->disk_name
rbd: cleanup: make kfree match kmalloc
rbd: warn on update_snaps failure on notify
ceph: check return value for start_request in writepages
ceph: remove useless check
libceph: add missing breaks in addr_set_port
libceph: fix TAG_WAIT case
ceph: fix broken comparison in readdir loop
libceph: fix osdmap timestamp assignment
ceph: fix rare potential cap leak
libceph: use snprintf for unknown addrs
libceph: use snprintf for formatting object name
ceph: use snprintf for dirstat content
libceph: fix uninitialized value when no get_authorizer method is set
...
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ceph/ceph_fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h index b8e995fbd867..b8c60694b2b0 100644 --- a/include/linux/ceph/ceph_fs.h +++ b/include/linux/ceph/ceph_fs.h @@ -313,6 +313,7 @@ enum { CEPH_MDS_OP_GETATTR = 0x00101, CEPH_MDS_OP_LOOKUPHASH = 0x00102, CEPH_MDS_OP_LOOKUPPARENT = 0x00103, + CEPH_MDS_OP_LOOKUPINO = 0x00104, CEPH_MDS_OP_SETXATTR = 0x01105, CEPH_MDS_OP_RMXATTR = 0x01106, |