Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-artful-kernel.git] / drivers / block / drbd / drbd_debugfs.c

diff --git a/drivers/block/drbd/drbd_debugfs.c b/drivers/block/drbd/drbd_debugfs.c
index 71cdce707ff2303141cd98e4fef8d143514fee53..de5c3ee8a7906555f28acb98b6d34987e4b0d82c 100644 (file)
--- a/drivers/block/drbd/drbd_debugfs.c
+++ b/drivers/block/drbd/drbd_debugfs.c
@@ -237,14 +237,9 @@ static void seq_print_peer_request_flags(struct seq_file *m, struct drbd_peer_re
        seq_print_rq_state_bit(m, f & EE_SEND_WRITE_ACK, &sep, "C");
        seq_print_rq_state_bit(m, f & EE_MAY_SET_IN_SYNC, &sep, "set-in-sync");
 
-       if (f & EE_IS_TRIM) {
-               seq_putc(m, sep);
-               sep = '|';
-               if (f & EE_IS_TRIM_USE_ZEROOUT)
-                       seq_puts(m, "zero-out");
-               else
-                       seq_puts(m, "trim");
-       }
+       if (f & EE_IS_TRIM)
+               __seq_print_rq_state_bit(m, f & EE_IS_TRIM_USE_ZEROOUT, &sep, "zero-out", "trim");
+       seq_print_rq_state_bit(m, f & EE_WRITE_SAME, &sep, "write-same");
        seq_putc(m, '\n');
 }
 
@@ -904,7 +899,7 @@ static int drbd_version_open(struct inode *inode, struct file *file)
        return single_open(file, drbd_version_show, NULL);
 }
 
-static struct file_operations drbd_version_fops = {
+static const struct file_operations drbd_version_fops = {
        .owner = THIS_MODULE,
        .open = drbd_version_open,
        .llseek = seq_lseek,